From 9137bd65270c98c23b5830a2af19c309fc2c205c Mon Sep 17 00:00:00 2001 From: Luke Imhoff Date: Wed, 5 Nov 2014 11:10:24 -0600 Subject: [PATCH] Revert "Update Gemfile.lock" MSP-11578 This reverts commit a3829b800d7f84d71ef7ff5185a4b073ee769091. --- Gemfile.lock | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 40d09aba75..825a1e2dbf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,9 +21,11 @@ PATH sqlite3 tzinfo metasploit-framework-db (4.10.1.pre.dev) + activerecord (< 4.0.0) + metasploit-credential (~> 0.12.0) metasploit-framework (= 4.10.1.pre.dev) - metasploit-framework-db (= 4.10.1.pre.dev) - metasploit-framework-pcap (= 4.10.1.pre.dev) + metasploit_data_models (~> 0.21.1) + pg (>= 0.11) metasploit-framework-pcap (4.10.1.pre.dev) metasploit-framework (= 4.10.1.pre.dev) network_interface (~> 0.0.1) @@ -60,6 +62,8 @@ GEM i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) arel (3.0.3) + arel-helpers (2.0.1) + activerecord (>= 3.1.0, < 5) aruba (0.6.1) childprocess (>= 0.3.6) cucumber (>= 1.1.1) @@ -108,9 +112,26 @@ GEM metasploit-concern (0.3.0) activesupport (~> 3.0, >= 3.0.0) railties (< 4.0.0) + metasploit-credential (0.12.0) + metasploit-concern (~> 0.3.0) + metasploit-model (~> 0.28.0) + metasploit_data_models (~> 0.21.0) + pg + railties (< 4.0.0) + rubyntlm + rubyzip (~> 1.1) metasploit-model (0.28.0) activesupport railties (< 4.0.0) + metasploit_data_models (0.21.1) + activerecord (>= 3.2.13, < 4.0.0) + activesupport + arel-helpers + metasploit-concern (~> 0.3.0) + metasploit-model (~> 0.28.0) + pg + railties (< 4.0.0) + recog (~> 1.0) meterpreter_bins (0.0.10) method_source (0.8.2) mime-types (1.25.1) @@ -122,6 +143,7 @@ GEM mini_portile (= 0.6.0) packetfu (1.1.9) pcaprub (0.11.3) + pg (0.17.1) polyglot (0.3.5) pry (0.10.0) coderay (~> 1.1.0) @@ -177,6 +199,7 @@ GEM rspec-core (~> 2.99.0) rspec-expectations (~> 2.99.0) rspec-mocks (~> 2.99.0) + rubyntlm (0.4.0) rubyzip (1.1.6) shoulda-matchers (2.6.2) simplecov (0.5.4)