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

Conflicts:
	Gemfile.lock
	metasploit-framework-db.gemspec

2015-03-17 15:47:48 -05:00

..

afp

Fix #4592, print_* methods used in LoginScanner modules

2015-02-20 22:46:21 -06:00

api

Revert "Various merge resolutions from master <- staging"

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

command

Avoid spinner on Windows

2014-12-30 10:17:56 -06: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

Pass the framework/module down into LoginScanner

2015-02-07 11:50:30 -06:00

jtr

Convert #find(:all) to #where or #all

2015-02-01 00:31:58 -06:00

login_scanner

allow the postgres librry to take an md5 hash

2015-03-03 13:16:46 -06:00

mssql

Fix #4592, print_* methods used in LoginScanner modules

2015-02-20 22:46:21 -06:00

parsed_options

Implement "-" for msfconsole -r from stdin

2015-01-29 19:26:56 -06:00

spec

Include Thread status when printing leaked threads

2014-11-17 09:30:46 -06:00

tcp

Pass the framework/module down into LoginScanner

2015-02-07 11:50:30 -06:00

telnet

Fix telnet

2014-10-21 11:08:41 -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

properly anchor regexes

2015-03-03 19:15:29 -06:00

credential.rb

allow credentials to have a type of postgres_md5

2015-03-03 16:35:30 -06: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

rails_version_constraint.rb

Update metasploit gems

2015-01-08 15:33:23 -06:00

require.rb

Explicitly require 'metasploit/credential' and 'metasploit_data_models'

2014-11-05 09:25:50 -06:00

spec.rb

Merge branch 'feature/MSP-11130/metasploit-framework-spec-constants' into feature/MSP-11147/thread-leak-detection

2014-11-05 15:47:59 -06:00

thread_factory_provider.rb

Wrap Msf::Framework#threads in Metasploit::Framework::ThreadFactoryProvider

2014-11-13 14:08:26 -06:00

version.rb

Updating version to 4.11 for Flood release

2014-12-15 14:42:09 -06:00