Merged
Conversation
|
Please sign your commits following these rules: $ git clone -b "revert-yolo" [email protected]:dperny/swarmkit-1.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -fAmending updates the existing PR. You DO NOT need to open a new one. |
This reverts commit 42085d2. Turns out it's a bad idea to merge a commit with the word "YOLO" in it. Signed-off-by: Drew Erny <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #2920 +/- ##
==========================================
- Coverage 61.64% 61.57% -0.08%
==========================================
Files 139 139
Lines 22615 22616 +1
==========================================
- Hits 13941 13925 -16
- Misses 7195 7216 +21
+ Partials 1479 1475 -4 |
Member
|
oh man, yes, forgot about that one; I think O only pushed that commit to try if it worked (was part of #2880) |
Member
|
@dperny I see @kolyshkin also had a PR to fix it in #2906 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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 reverts commit 42085d2.
Turns out it's a bad idea to merge a commit with the word "YOLO" in it.
This commit, when vendored into the docker engine, causes a test to hang. See moby/moby#40309.
The thing this was attempting to fix was worked around in #2919.
/cc @thaJeztah