Matt Buck 5e2d6c27c3 Merge branch 'master' into staging/rails-4.0 ...

Conflicts:
	Gemfile.lock
	db/schema.rb
	lib/msf/core/db_manager/session.rb
	metasploit-framework-db.gemspec

2015-04-06 11:27:00 -05:00

..

factories/mdm

cleans up a bunch of spec msftidy issues

2014-08-26 15:24:08 -05:00

file_fixtures

Revert "Various merge resolutions from master <- staging"

2014-08-22 10:17:44 -05:00

lib

Merge branch 'master' into staging/rails-4.0

2015-04-06 11:27:00 -05:00

models/metasploit/credential

cleans up a bunch of spec msftidy issues

2014-08-26 15:24:08 -05:00

modules

Set dynamic_size true for x64 stageless

2015-03-31 07:37:46 +10:00

support

Merge branch 'master' into staging/rails-4.0

2015-04-06 11:27:00 -05:00

tools

Fix specs

2015-04-03 16:00:28 -05:00

modules_spec.rb

Tag module specs with :content

2014-10-27 14:25:34 -05:00

msfcli_spec.rb

Remove unnecessary thread cleaning from Msfcli spec

2014-11-14 12:40:04 -06:00

msfupdate_spec.rb

Avoid its in Msfupdate specs

2014-09-02 12:53:24 -05:00

spec_helper.rb

Disable simplecov on travis-ci

2014-12-05 11:58:09 -06:00