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.

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

UPSTREAM: 28234: Make sure --record=false is acknowledged when passed to commands #10486

Merged
merged 2 commits into from
Aug 23, 2016

Conversation

damemi
Copy link

@damemi damemi commented Aug 17, 2016

Cherry-pick of upstream commit:

Ensures that when --record=false is explicity set that no ChangeCauseAnnotations are set on the object. Previously, if --record=true was used then all following actions triggered a ChangeCauseAnnotation even if --record=false was set, due to the prior ChangeCauseAnnotation existing.

Reference to bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1351127

@ncdc
Copy link
Contributor

ncdc commented Aug 18, 2016

[test]

@ncdc
Copy link
Contributor

ncdc commented Aug 18, 2016

@damemi rebase needed (FAILURE: Generated docs up to date, but generated man pages out of date. Please run hack/update-generated-docs.sh)

@ncdc
Copy link
Contributor

ncdc commented Aug 18, 2016

@smarterclayton when can we get generated docs etc out of the repo? Rebasing for an error like this shouldn't be necessary.

@smarterclayton
Copy link
Contributor

It's probably pretty far down the priority list.

@damemi damemi force-pushed the master branch 3 times, most recently from 5ee4a2d to 1e22565 Compare August 19, 2016 15:26
@pweil-
Copy link

pweil- commented Aug 19, 2016

flakes #10002 #9548 #9490

re[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 1e22565

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/8254/)

@pweil-
Copy link

pweil- commented Aug 23, 2016

@ncdc were you ok with this one merging? Tests are green.

@ncdc
Copy link
Contributor

ncdc commented Aug 23, 2016

LGTM [merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Aug 23, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/8254/) (Image: devenv-rhel7_4907)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 1e22565

@openshift-bot openshift-bot merged commit feff317 into openshift:master Aug 23, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants