Skip to content

prevent Normalize from running twice on oadm drain #12651

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

Merged

Conversation

juanvallejo
Copy link
Contributor

Related Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1415985

This patch avoids running template#Normalize twice on the description
and example text of the oadm drain command. This fixes the broken link
in the command's long description.

Before

$ oadm drain -h
...
! http://kubernetes.io/images/docs/kubectl _drain.svg
...

After

$ oadm drain -h
...
! http://kubernetes.io/images/docs/kubectl_drain.svg
...

@openshift/cli-review

@fabianofranz
Copy link
Member

[merge]

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@fabianofranz
Copy link
Member

oops, @juanvallejo squash and I'll tag again.

This patch avoids running template#Normalize twice on the description
and example text of the `oadm drain` command. This fixes the broken link
in the command's long description.
@juanvallejo juanvallejo force-pushed the jvallejo/fix-link-in-oadm-drain branch from 272960d to b3949de Compare January 24, 2017 19:33
@juanvallejo
Copy link
Contributor Author

integration check flaked on #11438 re[test]

@fabianofranz
Copy link
Member

[merge]

@juanvallejo
Copy link
Contributor Author

check flaked on #12667 re[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to b3949de

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/13316/) (Base Commit: 59e57b1)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to b3949de

@fabianofranz
Copy link
Member

flaked on #12667 [merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 26, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/13337/) (Base Commit: 39e4f8c) (Image: devenv-rhel7_5787)

@openshift-bot openshift-bot merged commit 3e38a69 into openshift:master Jan 26, 2017
@juanvallejo juanvallejo deleted the jvallejo/fix-link-in-oadm-drain branch January 26, 2017 18:06
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.

3 participants