Tod Beardsley a431bff13f @wvu-r7 is a skilled negotiator. s/stdout/stderr/

2014-10-17 13:13:44 -05:00

..

afp

Revert "Various merge resolutions from master <- staging"

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

api

Revert "Various merge resolutions from master <- staging"

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

command

@wvu-r7 is a skilled negotiator. s/stdout/stderr/

2014-10-17 13:13:44 -05:00

core

Revert "Various merge resolutions from master <- staging"

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

database

Restore backup database.yml when retesting after interrupt

2014-08-28 15:20:53 -05:00

ftp

Revert "Various merge resolutions from master <- staging"

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

jtr

Revert "Various merge resolutions from master <- staging"

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

login_scanner

Fixing Comment

2014-10-07 11:28:40 -05:00

mssql

Fixes #3915 - NoMethodError private method `rhost'

2014-09-30 11:34:16 -05:00

parsed_options

Move database.yml selection to Metasploit::Framework::Database

2014-08-27 12:01:43 -05:00

tcp

Revert "Various merge resolutions from master <- staging"

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

telnet

Revert "Various merge resolutions from master <- staging"

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

api.rb

Revert "Various merge resolutions from master <- staging"

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

command.rb

Revert "Various merge resolutions from master <- staging"

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

common_engine.rb

Rename the method for optional requires

2014-10-03 14:06:13 -05:00

community_string_collection.rb

Revert "Various merge resolutions from master <- staging"

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

core.rb

Revert "Various merge resolutions from master <- staging"

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

credential_collection.rb

Revert "Various merge resolutions from master <- staging"

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

credential.rb

Revert "Various merge resolutions from master <- staging"

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

database.rb

Remove unnecessary return

2014-08-27 16:58:45 -05:00

engine.rb

Revert "Various merge resolutions from master <- staging"

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

login_scanner.rb

Revert "Various merge resolutions from master <- staging"

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

parsed_options.rb

Revert "Various merge resolutions from master <- staging"

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

require.rb

Rename the method for optional requires

2014-10-03 14:06:13 -05:00

version.rb

Merge branch staging/electro-release into master

2014-08-22 10:50:38 -05:00