bump(k8s.io/kubernetes): f0cd09aabeeeab1780911c8023203993fd421946 #7203
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
Contributor
|
@smarterclayton what tag did you expect to be used from the openshift/kubernetes repo? |
pweil-
force-pushed
the
bump-k8s-20160210
branch
from
42332da to
9fca756
Compare
pweil-
changed the title
Contributor
|
We should move the tag 1.2.0-origin to point to whatever we're rebasing on.
|
Contributor
|
moving tags? hissssss |
Contributor
|
A tag is a fancy branch.
|
Contributor
|
@pweil- missed the window. More upstreams merged in. I would try to run the cycle again to have a good marker in the commit history for where to re-pick at the end of the rebase. |
Author
|
Dang it. |
pweil-
force-pushed
the
bump-k8s-20160210
branch
from
9fca756 to
dcc4b28
Compare
pweil-
changed the title
pweil-
force-pushed
the
bump-k8s-20160210
branch
from
dcc4b28 to
5182d32
Compare
deads2k
added a commit
that referenced
this pull request
Feb 11, 2016
bump(k8s.io/kubernetes): f0cd09aabeeeab1780911c8023203993fd421946
Contributor
|
lgtm. Merged as a marker so we can move forward the rebase and have a clean spot to re-pick from at the end. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Bump to stable-20160127 which now includes all the patches from the last bump (openshift/kubernetes#6).
@deads2k - question: I know you said to base my openshift/kubernetes commit on the stable-20160127 branch but this GoDep looks like it was from the v1.2.0-origin tag. Is that an issue or is this correct?