Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.14.6 rebase #23674

Merged
merged 10 commits into from
Sep 7, 2019
Merged

1.14.6 rebase #23674

merged 10 commits into from
Sep 7, 2019

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Aug 26, 2019 •
edited
Loading

About 6 hours

Updates to 1.14.6 and eliminates patches that are only needed by other repos.

Picklist: https://docs.google.com/spreadsheets/d/12txg87Jq-BRfPsgMYWgdy_eH94lVOwGtseIe4OWPmZ0/edit#gid=1413655187

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Aug 26, 2019
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 26, 2019
@mfojtik
Copy link
Contributor

mfojtik commented Aug 28, 2019

/retest

@deads2k
Copy link
Contributor Author

deads2k commented Aug 30, 2019

/hold

to ensure this isn't merged until we re-check the carry list

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 30, 2019
@deads2k deads2k force-pushed the rebase-1.14.6 branch 4 times, most recently from c32346d to f7535f9 Compare September 5, 2019 12:54
@deads2k
Copy link
Contributor Author

deads2k commented Sep 6, 2019

/retest

@derekwaynecarr
Copy link
Member

agree we should take the latest upstream prior to 4.2.0.

@mfojtik
Copy link
Contributor

mfojtik commented Sep 6, 2019

/lgtm

Please open a follow up BZ for the file locking issue

/hold

Holding so @soltysh and @sttts can take a stab

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 6, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, mfojtik, soltysh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [deads2k,mfojtik,soltysh]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

sttts
sttts reviewed Sep 6, 2019
View reviewed changes
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/config_test.go Outdated
@@ -87,6 +87,7 @@ func TestCurrentContext(t *testing.T) {
}

func TestSetCurrentContext(t *testing.T) {
t.Skip()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

document in the commit message why

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

document in the commit message why

removed that commit. Found the lock file culprit

sttts
sttts reviewed Sep 6, 2019
View reviewed changes
glide.yaml
@@ -71,7 +71,7 @@ import:
version: origin-4.2-kubernetes-1.14.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

while probably not super important. Would switch all of them.

@sttts
Copy link
Contributor

sttts commented Sep 6, 2019

Looks good overall. Some nits.

@soltysh
Copy link
Contributor

soltysh commented Sep 6, 2019

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 6, 2019
@deads2k
Copy link
Contributor Author

deads2k commented Sep 6, 2019

/hold

holding again because there's a new upstream commit

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 6, 2019
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Sep 6, 2019
@openshift-ci-robot
Copy link

New changes are detected. LGTM label has been removed.

@deads2k deads2k added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Sep 6, 2019
@deads2k
Copy link
Contributor Author

deads2k commented Sep 6, 2019

/hold cancel

updated

@mfojtik mfojtik added priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. queue/critical-fix labels Sep 6, 2019
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@deads2k
Copy link
Contributor Author

deads2k commented Sep 6, 2019

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit b76ca33 into openshift:master Sep 7, 2019
@bertinatto bertinatto mentioned this pull request Sep 10, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sttts sttts sttts left review comments

@soltysh soltysh soltysh approved these changes

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

@tbielawa tbielawa Awaiting requested review from tbielawa

Assignees

@mfojtik mfojtik

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. queue/critical-fix size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@deads2k @mfojtik @derekwaynecarr @openshift-ci-robot @sttts @soltysh @openshift-bot @openshift-merge-robot