Update Gemfile.lock and schema.rb

bug/bundler_fix
Trevor Rosen 2015-02-18 15:17:17 -06:00
parent a0787f5bb9
commit 62fbf81f8a
No known key found for this signature in database
GPG Key ID: 255ADB7A642D3928
2 changed files with 10 additions and 9 deletions

View File

@ -22,9 +22,9 @@ PATH
tzinfo tzinfo
metasploit-framework-db (4.11.0.pre.dev) metasploit-framework-db (4.11.0.pre.dev)
activerecord (>= 3.2.21, < 4.0.0) activerecord (>= 3.2.21, < 4.0.0)
metasploit-credential (~> 0.13.19) metasploit-credential (~> 0.14.0)
metasploit-framework (= 4.11.0.pre.dev) metasploit-framework (= 4.11.0.pre.dev)
metasploit_data_models (~> 0.22.8) metasploit_data_models (~> 0.23.0)
pg (>= 0.11) pg (>= 0.11)
metasploit-framework-pcap (4.11.0.pre.dev) metasploit-framework-pcap (4.11.0.pre.dev)
metasploit-framework (= 4.11.0.pre.dev) metasploit-framework (= 4.11.0.pre.dev)
@ -112,10 +112,10 @@ GEM
metasploit-concern (0.3.0) metasploit-concern (0.3.0)
activesupport (~> 3.0, >= 3.0.0) activesupport (~> 3.0, >= 3.0.0)
railties (< 4.0.0) railties (< 4.0.0)
metasploit-credential (0.13.19) metasploit-credential (0.14.0)
metasploit-concern (~> 0.3.0) metasploit-concern (~> 0.3.0)
metasploit-model (~> 0.29.0) metasploit-model (~> 0.29.0)
metasploit_data_models (~> 0.22.8) metasploit_data_models (~> 0.23.0)
pg pg
railties (< 4.0.0) railties (< 4.0.0)
rubyntlm rubyntlm
@ -123,7 +123,7 @@ GEM
metasploit-model (0.29.0) metasploit-model (0.29.0)
activesupport activesupport
railties (< 4.0.0) railties (< 4.0.0)
metasploit_data_models (0.22.8) metasploit_data_models (0.23.0)
activerecord (>= 3.2.13, < 4.0.0) activerecord (>= 3.2.13, < 4.0.0)
activesupport activesupport
arel-helpers arel-helpers

View File

@ -11,7 +11,7 @@
# #
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20150205192745) do ActiveRecord::Schema.define(:version => 20150212214222) do
create_table "api_keys", :force => true do |t| create_table "api_keys", :force => true do |t|
t.text "token" t.text "token"
@ -102,7 +102,7 @@ ActiveRecord::Schema.define(:version => 20150205192745) do
create_table "hosts", :force => true do |t| create_table "hosts", :force => true do |t|
t.datetime "created_at" t.datetime "created_at"
t.string "address", :limit => nil, :null => false t.string "address", :null => false
t.string "mac" t.string "mac"
t.string "comm" t.string "comm"
t.string "name" t.string "name"
@ -454,6 +454,7 @@ ActiveRecord::Schema.define(:version => 20150205192745) do
t.text "info" t.text "info"
end end
add_index "services", ["host_id", "port", "proto"], :name => "index_services_on_host_id_and_port_and_proto", :unique => true
add_index "services", ["name"], :name => "index_services_on_name" add_index "services", ["name"], :name => "index_services_on_name"
add_index "services", ["port"], :name => "index_services_on_port" add_index "services", ["port"], :name => "index_services_on_port"
add_index "services", ["proto"], :name => "index_services_on_proto" add_index "services", ["proto"], :name => "index_services_on_proto"
@ -685,7 +686,7 @@ ActiveRecord::Schema.define(:version => 20150205192745) do
create_table "wmap_requests", :force => true do |t| create_table "wmap_requests", :force => true do |t|
t.string "host" t.string "host"
t.string "address", :limit => nil t.string "address"
t.integer "port" t.integer "port"
t.integer "ssl" t.integer "ssl"
t.string "meth", :limit => 32 t.string "meth", :limit => 32
@ -702,7 +703,7 @@ ActiveRecord::Schema.define(:version => 20150205192745) do
create_table "wmap_targets", :force => true do |t| create_table "wmap_targets", :force => true do |t|
t.string "host" t.string "host"
t.string "address", :limit => nil t.string "address"
t.integer "port" t.integer "port"
t.integer "ssl" t.integer "ssl"
t.integer "selected" t.integer "selected"