Revert "Fix conflcit lib/msf/util/exe.rb" #2624
Merged
Conversation
This file contains 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
This was causing build failures: https://travis-ci.org/rapid7/metasploit-framework/builds/13816889 It looks like there were a whole bunch of changes that weren't intended. This reverts commit 3996557, reversing changes made to 62102dd.
|
Looks like fbc661d resolved; testing now. |
todb-r7
referenced
this pull request
in wchen-r7/metasploit-framework
Nov 11, 2013
|
Errors on verify_bin_fingerprint(), but Travis doesn't get them. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 reverts commit 3996557, reversing
changes made to 62102dd.
@wchen-r7 , please verify. This was causing build failures:
https://travis-ci.org/rapid7/metasploit-framework/builds/13816889
It looks like there were a whole bunch of changes that weren't intended.
Reverting this commit resolves the rspec tests, but now it's difficult to tell what was lost in the PRs you landed after f5d1d8e
Specifically, PR #2577 and #2544. Those may have to be redone.