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

Gemfile

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

Gemfile.lock

@@ -1,10 +1,10 @@
 GIT
   remote: git://github.com/rapid7/metasploit_data_models.git
-  revision: 67d78f9ce59a74ad9d6e8d3f9e68760ff4d2ec55
+  revision: bf26ddf71e7ba2f66d3ba528fc67029f5c6a6135
-  tag: 0.6.2
+  tag: 0.6.3
   specs:
-    metasploit_data_models (0.6.2)
+    metasploit_data_models (0.6.3)
-      activerecord (>= 3.2.10)
+      activerecord (>= 3.2.13)
       activesupport
       pg
       pry
@@ -12,22 +12,22 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.12)
+    activemodel (3.2.13)
-      activesupport (= 3.2.12)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.12)
+    activerecord (3.2.13)
-      activemodel (= 3.2.12)
+      activemodel (= 3.2.13)
-      activesupport (= 3.2.12)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.12)
+    activesupport (3.2.13)
-      i18n (~> 0.6)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
     coderay (1.0.9)
     diff-lcs (1.1.3)
-    i18n (0.6.4)
+    i18n (0.6.1)
     json (1.7.7)
     method_source (0.8.1)
     msgpack (0.5.2)
@@ -54,8 +54,8 @@ GEM
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    slop (3.4.3)
+    slop (3.4.4)
-    tzinfo (0.3.36)
+    tzinfo (0.3.37)
     yard (0.8.3)
 
 PLATFORMS

lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.6.2/metasploit_data_models.gemspec

@@ -1,30 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "metasploit_data_models/version"
-
-Gem::Specification.new do |s|
-  s.name        = "metasploit_data_models"
-  s.version     = MetasploitDataModels::VERSION
-  s.authors     = ["Trevor Rosen"]
-  s.email       = ["trevor_rosen@rapid7.com"]
-  s.homepage    = ""
-  s.summary     = %q{Database code for MSF and Metasploit Pro}
-  s.description = %q{Implements minimal ActiveRecord models and database helper code used in both the Metasploit Framework (MSF) and Metasploit commercial editions.}
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  # ---- Dependencies ----
-  s.add_development_dependency 'rake'
-  # markdown formatting for yard
-  s.add_development_dependency 'redcarpet'
-  # documentation
-  s.add_development_dependency 'yard'
-
-  s.add_runtime_dependency 'activerecord', '>= 3.2.10'
-  s.add_runtime_dependency 'activesupport'
-  s.add_runtime_dependency 'pg'
-  s.add_runtime_dependency 'pry'
-end