Carry patch to docker/docker in pkg/build/vendor that allows compilation against our version #13467
Conversation
|
[Test]ing while waiting on the merge queue |
pkg/build/Godeps/Godeps.json
Outdated
| { | ||
| "ImportPath": "github.com/Azure/go-ansiterm/winterm", | ||
| "Rev": "70b2c90b260171e829f1ebd7c17f600c11858dbe" | ||
| }, |
There was a problem hiding this comment.
why isn't it sufficient that origin itself already godeps this? are the godeps not unioned together?
There was a problem hiding this comment.
Hrm - testing that
There was a problem hiding this comment.
You're right, rebasing
Empty array in Bash is considered unset
| @@ -142,14 +142,14 @@ func readInputEvents(fd uintptr, maxBytes int) ([]winterm.INPUT_RECORD, error) { | |||
|
|
|||
| // KeyEvent Translation Helpers | |||
|
|
|||
| var arrowKeyMapPrefix = map[uint16]string{ | |||
| var arrowKeyMapPrefix = map[winterm.WORD]string{ | |||
There was a problem hiding this comment.
still picking up a vendored file change w/ no godeps change?
There was a problem hiding this comment.
This is an UPSTREAM commit that mirrors the patch we carry on the main vendor dir.
smarterclayton
changed the title
|
Crash is unrelated [merge] |
|
[test] |
|
Evaluated for origin test up to f70f88f |
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/348/) (Base Commit: 4a5fb49) |
|
Evaluated for origin merge up to f70f88f |
|
continuous-integration/openshift-jenkins/merge FAILURE (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/159/) (Base Commit: df749cd) |
|
Force merging, this is ridiculous. |
This is a blocker for cutting the alpha tag.
@bparees
[merge]