Fix a git snafu when landing #11131 #11637
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
While landing PR rapid7#11131, I tripped over my own shoelaces and overwrote `weblogic_deserialize_rawobject.rb` with `weblogic_deserialize_unicastref.rb`, destroying my changes and introducing a great deal of confusion. This PR gets us back to where we should have been, with rapid7#11131 landed and a few changes to add randomization and expanding on the T3 protocol.
jmartin-tech
added a commit
that referenced
this pull request
Mar 26, 2019
msjenkins-r7
pushed a commit
that referenced
this pull request
Mar 26, 2019
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.
While landing PR #11131, I tripped over my own shoelaces and overwrote
weblogic_deserialize_rawobject.rbwithweblogic_deserialize_unicastref.rb, destroying my changes and introducing a great deal of confusion.This PR gets us back to where we should have been, with #11131 landed and a few changes to add randomization and expanding on the T3 protocol.