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 'bug/MSP-10663/core-opts-needs-a-task-id' into staging/electro-release 

MSP-10663
bug/bundler_fix
Luke Imhoff 2014-07-08 19:45:11 -05:00
parent b65989ff0c dd75c645c3
commit 467c686701
No known key found for this signature in database
GPG Key ID: 5B1FB01FB33356F8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -7,7 +7,7 @@ group :db do
# Needed for Msf::DbManager # Needed for Msf::DbManager
gem 'activerecord', '>= 3.0.0', '< 4.0.0' gem 'activerecord', '>= 3.0.0', '< 4.0.0'
# Metasploit::Credential database models # Metasploit::Credential database models
gem 'metasploit-credential', git: 'github-metasploit-credential:rapid7/metasploit-credential.git', tag: 'v0.5.5.pre.electro.pre.release' gem 'metasploit-credential', git: 'github-metasploit-credential:rapid7/metasploit-credential.git', tag: 'v0.5.6.pre.electro.pre.release'
# Database models shared between framework and Pro. # Database models shared between framework and Pro.
gem 'metasploit_data_models', '>= 0.18.0', '< 0.19' gem 'metasploit_data_models', '>= 0.18.0', '< 0.19'
# Needed for module caching in Mdm::ModuleDetails # Needed for module caching in Mdm::ModuleDetails

6
Gemfile.lock
View File

@ -1,9 +1,9 @@
GIT GIT
remote: github-metasploit-credential:rapid7/metasploit-credential.git remote: github-metasploit-credential:rapid7/metasploit-credential.git
revision: 5f83705b0f6b918159ba7c86dabb518b716f9ed6 revision: 8a8b4f74535d728b1852e4d4d55abb9d828b8a8a
tag: v0.5.5.pre.electro.pre.release tag: v0.5.6.pre.electro.pre.release
specs: specs:
metasploit-credential (0.5.5.pre.electro.pre.release) metasploit-credential (0.5.6.pre.electro.pre.release)
metasploit-concern (~> 0.1.0) metasploit-concern (~> 0.1.0)
metasploit-model (>= 0.25.1, < 0.26) metasploit-model (>= 0.25.1, < 0.26)
metasploit_data_models (>= 0.18.0, < 0.19) metasploit_data_models (>= 0.18.0, < 0.19)