Merge pull request #76 from rapid7/bug/MSP-10006

PRs complete

MSP-10006 #land
bug/bundler_fix
Samuel Huckins 2014-06-16 15:35:27 -05:00
commit 4a7ee57866
2 changed files with 4 additions and 4 deletions

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.4.1-electro-release' gem 'metasploit-credential', git: 'github-metasploit-credential:rapid7/metasploit-credential.git', tag: 'v0.4.2-electro-release'
# Database models shared between framework and Pro. # Database models shared between framework and Pro.
gem 'metasploit_data_models', '~> 0.17.1' gem 'metasploit_data_models', '~> 0.17.1'
# Needed for module caching in Mdm::ModuleDetails # Needed for module caching in Mdm::ModuleDetails

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: 39fc93ded093ad862f62d257bcf9c5a08b614d30 revision: fb574101559188f85356519f326117b11788c080
tag: v0.4.1-electro-release tag: v0.4.2-electro-release
specs: specs:
metasploit-credential (0.4.1.pre.electro.pre.release) metasploit-credential (0.4.2.pre.originating.pre.host.pre.id.pre.scope.pre.sucks)
metasploit-concern (~> 0.1.0) metasploit-concern (~> 0.1.0)
metasploit_data_models (~> 0.17.0) metasploit_data_models (~> 0.17.0)
rubyntlm rubyntlm