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

Merge branch 'master' of https://github.com/rapid7/metasploit-framework

bug/bundler_fix
jvazquez-r7 2013-04-12 02:11:15 +02:00
parent 9c0862ad7b 960392d614
commit 0e08bdfeb5
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -7,7 +7,7 @@ gem 'activerecord'
# Needed for some admin modules (scrutinizer_add_user.rb) # Needed for some admin modules (scrutinizer_add_user.rb)
gem 'json' gem 'json'
# Database models shared between framework and Pro. # Database models shared between framework and Pro.
gem 'metasploit_data_models', :git => 'git://github.com/rapid7/metasploit_data_models.git', :tag => '0.6.4' gem 'metasploit_data_models', '~> 0.6.14'
# Needed by msfgui and other rpc components # Needed by msfgui and other rpc components
gem 'msgpack' gem 'msgpack'
# Needed by anemone crawler # Needed by anemone crawler

16
Gemfile.lock
View File

@ -1,13 +1,3 @@
GIT
remote: git://github.com/rapid7/metasploit_data_models.git
revision: d6af3cf0413c1ad317c16c143791097bd0a5afff
tag: 0.6.4
specs:
metasploit_data_models (0.6.4)
activerecord (>= 3.2.13)
activesupport
pg
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
@ -30,6 +20,10 @@ GEM
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
i18n (0.6.1) i18n (0.6.1)
json (1.7.7) json (1.7.7)
metasploit_data_models (0.6.14)
activerecord (>= 3.2.13)
activesupport
pg
msgpack (0.5.4) msgpack (0.5.4)
multi_json (1.0.4) multi_json (1.0.4)
nokogiri (1.5.9) nokogiri (1.5.9)
@ -62,7 +56,7 @@ DEPENDENCIES
database_cleaner database_cleaner
factory_girl (>= 4.1.0) factory_girl (>= 4.1.0)
json json
metasploit_data_models! metasploit_data_models (~> 0.6.14)
msgpack msgpack
nokogiri nokogiri
pcaprub pcaprub