David Maloney 9b9de12a38 Merge branch 'master' into staging/electro-release ...

Conflicts:
	lib/msf/core/framework.rb

2014-06-06 12:04:53 -05:00

..

factories/mdm

Retab all the things (except external/)

2013-09-30 13:47:53 -05:00

file_fixtures

add shellcode file fixture

2014-02-05 11:01:40 -06:00

lib

Merge branch 'master' into staging/electro-release

2014-06-06 12:04:53 -05:00

support

Merge pull request #45 from rapid7/feature/MSP-9988/credential-collection

2014-06-06 11:53:28 -05:00

tools

Put classes under a module

2014-01-12 15:54:56 -06:00

msfcli_spec.rb

Remove to_s inside #{}

2014-01-23 14:21:48 -06:00

msfupdate_spec.rb

Allow stubbing stdin in msfupdate

2013-11-15 17:15:15 -06:00

spec_helper.rb

Use railties to load Metasploit::Credential correctly

2014-05-12 15:03:51 -05:00