Retab/pr/1373 #1
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Tell daddy how you want it.
[FixRM rapid7#8338] [FixRM rapid7#8337]
[FixRM rapid7#8334] [FixRM rapid7#8333]
msftidy is complaining, here: keylog_recorder.rb:116 - [WARNING] File.open without binary mode Not sure how this managed to hit upstream/master with msftidy warnings. Protip, use an msftidy pre-commit hook. We have just such a hook script in tools/dev, as a matter of fact, so it's just a symlink away: https://github.com/rapid7/metasploit-framework/blob/master/tools/dev/pre-commit-hook.rb
Fix require on Python bind_tcp stager
Local backups are generally not needed since you can just git checkout old versions anyway before committing. It was nice to have during dev but generally shouldn't be done now.
zeknox
pushed a commit
that referenced
this pull request
Oct 17, 2013
Clean up timeout logic and update description
zeknox
pushed a commit
that referenced
this pull request
Oct 17, 2013
Disambiguate tape_engine_8A as tape_engine_0x8a
zeknox
pushed a commit
that referenced
this pull request
Oct 17, 2013
zeknox
pushed a commit
that referenced
this pull request
Dec 13, 2013
Fixes for rapid7#2350, random bind shellcode
zeknox
pushed a commit
that referenced
this pull request
Dec 13, 2013
Tweaks & fixes to osx mount PR
zeknox
pushed a commit
that referenced
this pull request
Dec 13, 2013
Clean php_wordpress_optimizepress
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR retabs rapid7#1373 using the procedure documented at http://r-7.co/MSF-TABS. If you land this pull request to your branch, your original PR will no longer be conflicted if the retabbing caused conflicts by changing leading whitespace.
Don't forget to
git pushyour changes after landing this!