infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Land #4176, revert of 14514d7

bug/bundler_fix
William Vu 2014-11-11 14:57:40 -06:00
parent baf7065e1b 64aaa50132
commit 2a6d288fe8
No known key found for this signature in database
GPG Key ID: E761DCB4C1629024
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Gemfile.lock
View File

@ -22,7 +22,7 @@ PATH
tzinfo tzinfo
metasploit-framework-db (4.10.1.pre.dev) metasploit-framework-db (4.10.1.pre.dev)
activerecord (< 4.0.0) activerecord (< 4.0.0)
metasploit-credential (~> 0.13.0) metasploit-credential (~> 0.12.0)
metasploit-framework (= 4.10.1.pre.dev) metasploit-framework (= 4.10.1.pre.dev)
metasploit_data_models (~> 0.21.1) metasploit_data_models (~> 0.21.1)
pg (>= 0.11) pg (>= 0.11)
@ -112,7 +112,7 @@ GEM
metasploit-concern (0.3.0) metasploit-concern (0.3.0)
activesupport (~> 3.0, >= 3.0.0) activesupport (~> 3.0, >= 3.0.0)
railties (< 4.0.0) railties (< 4.0.0)
metasploit-credential (0.13.1) metasploit-credential (0.12.0)
metasploit-concern (~> 0.3.0) metasploit-concern (~> 0.3.0)
metasploit-model (~> 0.28.0) metasploit-model (~> 0.28.0)
metasploit_data_models (~> 0.21.0) metasploit_data_models (~> 0.21.0)
@ -135,12 +135,12 @@ GEM
meterpreter_bins (0.0.10) meterpreter_bins (0.0.10)
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (1.25.1)
mini_portile (0.6.1) mini_portile (0.6.0)
msgpack (0.5.9) msgpack (0.5.9)
multi_json (1.0.4) multi_json (1.0.4)
network_interface (0.0.1) network_interface (0.0.1)
nokogiri (1.6.4.1) nokogiri (1.6.3.1)
mini_portile (~> 0.6.0) mini_portile (= 0.6.0)
packetfu (1.1.9) packetfu (1.1.9)
pcaprub (0.11.3) pcaprub (0.11.3)
pg (0.17.1) pg (0.17.1)
@ -175,7 +175,7 @@ GEM
rb-readline (0.5.1) rb-readline (0.5.1)
rdoc (3.12.2) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
recog (1.0.5) recog (1.0.0)
nokogiri nokogiri
redcarpet (3.1.2) redcarpet (3.1.2)
rkelly-remix (0.0.6) rkelly-remix (0.0.6)
@ -207,7 +207,7 @@ GEM
simplecov-html (~> 0.5.3) simplecov-html (~> 0.5.3)
simplecov-html (0.5.3) simplecov-html (0.5.3)
slop (3.6.0) slop (3.6.0)
sprockets (2.2.3) sprockets (2.2.2)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
@ -219,7 +219,7 @@ GEM
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.42) tzinfo (0.3.41)
xpath (2.0.0) xpath (2.0.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
yard (0.8.7.4) yard (0.8.7.4)

2
metasploit-framework-db.gemspec
View File

@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
spec.add_runtime_dependency 'activerecord', rails_version_constraint spec.add_runtime_dependency 'activerecord', rails_version_constraint
# Metasploit::Credential database models # Metasploit::Credential database models
spec.add_runtime_dependency 'metasploit-credential', '~> 0.13.0' spec.add_runtime_dependency 'metasploit-credential', '~> 0.12.0'
# Database models shared between framework and Pro. # Database models shared between framework and Pro.
spec.add_runtime_dependency 'metasploit_data_models', '~> 0.21.1' spec.add_runtime_dependency 'metasploit_data_models', '~> 0.21.1'
# depend on metasploit-framewrok as the optional gems are useless with the actual code # depend on metasploit-framewrok as the optional gems are useless with the actual code