Brent Cook 90b97d6581 Merge branch 'upstream-master' into land-9151-

2017-12-15 14:15:14 -06:00

..

active_record/connection_adapters/abstract_adapter

example_group and hook_scope conversions

2015-12-31 16:56:13 -06:00

metasploit/framework

fix spec for reals this time

2017-04-18 14:30:29 -05:00

msf

Land #9110, added -C option to change default hosts columns

2017-11-29 17:48:44 -06:00

net/dns

handle Ruby 2.4 Fixnum/Bignum -> Integer deprecations

2017-01-22 10:20:03 -06:00

rex

Support multiple suffixes on meterpreter extensions.

2017-10-31 10:04:34 -05:00