infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
metasploit-framework/lib/rex/proto
History
Brandon Turner 05f0d09828
Merge branch staging/electro-release into master 
On August 15, shuckins-r7 merged the Metasploit 4.10.0 branch
(staging/electro-release) into master.  Rather than merging with
history, he squashed all history into two commits (see
149c3ecc63 and
82760bf5b3).

We want to preserve history (for things like git blame, git log, etc.).
So on August 22, we reverted the commits above (see
19ba7772f3).

This merge commit merges the staging/electro-release branch
(62b81d6814) into master
(48f0743d1b).  It ensures that any changes
committed to master since the original squashed merge are retained.

As a side effect, you may see this merge commit in history/blame for the
time period between August 15 and August 22.
 		2014-08-22 10:50:38 -05:00
..
dcerpc Fix improper use of host-endian or signed pack/unpack 2014-06-30 02:50:10 -05:00
dhcp Retab lib 2013-08-30 16:28:33 -05:00
drda FixRM #8396 change all lib use of regex to 8-bit pattern 2013-09-12 16:58:49 -05:00
http Modify get_cookies regular expression 2014-07-06 13:22:31 -05:00
iax2 Retab lib 2013-08-30 16:28:33 -05:00
ipmi Add 'coding: binary' to all msf/rex library files 2014-08-17 17:31:53 -05:00
natpmp Fix improper use of host-endian or signed pack/unpack 2014-06-30 02:50:10 -05:00
ntlm Retab lib 2013-08-30 16:28:33 -05:00
ntp Add rubygems check to msftidy. remove rubygems. 2014-07-17 09:29:13 -07:00
pjl Add 'coding: binary' to all msf/rex library files 2014-08-17 17:31:53 -05:00
proxy Restore comment header and remove carriage returns 2013-11-11 12:16:14 -06:00
rfb Retab lib 2013-08-30 16:28:33 -05:00
smb Revert "Various merge resolutions from master <- staging" 2014-08-22 10:17:44 -05:00
sunrpc Retab lib 2013-08-30 16:28:33 -05:00
tftp Retab lib 2013-08-30 16:28:33 -05:00
addp.rb Retab lib 2013-08-30 16:28:33 -05:00
dcerpc.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
dhcp.rb Remove $Id tags 2013-05-20 16:21:03 -05:00
drda.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
http.rb first run at Clientrequest object 2013-02-17 19:25:27 -06:00
iax2.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
ipmi.rb Retab lib 2013-08-30 16:28:33 -05:00
natpmp.rb Fix Undocumentable method, missing name YARD warning 2013-03-30 15:32:38 -05:00
ntlm.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
ntp.rb Move NTP message code to Rex::Proto::NTP, simplify option handling 2014-06-30 23:57:47 -07:00
pjl.rb Add 'coding: binary' to all msf/rex library files 2014-08-17 17:31:53 -05:00
rfb.rb Remove $Id tags 2013-05-20 16:21:03 -05:00
smb.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
sunrpc.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
tftp.rb Remove $Id tags 2013-05-20 16:21:03 -05:00