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

Update template annotations #2304

Merged
merged 1 commit into from
Oct 20, 2017
Merged

Update template annotations #2304

merged 1 commit into from
Oct 20, 2017

Conversation

spadgett
Copy link
Member

  • template.openshift.io/provider-display-name -> openshift.io/provider-display-Name
  • template.openshift.io/documentation-url -> openshift.io/documentation-url
  • template.openshift.io/support-url -> openshift.io/support-url

See also openshift/origin-web-catalog#487

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 18, 2017
@spadgett
Copy link
Member Author

@sspeiche @bparees FYI

@spadgett spadgett added the kind/bug Categorizes issue or PR as related to a bug. label Oct 18, 2017
@bparees
Copy link
Contributor

bparees commented Oct 18, 2017

you'll want to wait until openshift/origin#16925 merges for this to go in, i think.

@stevekuznetsov
Copy link
Contributor

/hold

@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 Oct 18, 2017
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 20, 2017
@spadgett
Update template annotations
d952bcb 
template.openshift.io/provider-display-name ->
openshift.io/provider-display-Name

template.openshift.io/documentation-url ->
openshift.io/documentation-url

template.openshift.io/support-url ->
openshift.io/support-url
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 20, 2017
@spadgett
Copy link
Member Author

Upstream PR merged

/hold cancel
/assign @jwforres

@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 Oct 20, 2017
@jwforres
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 20, 2017
@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit fe6a53a into openshift:master Oct 20, 2017
@spadgett spadgett deleted the provider-display-name branch October 20, 2017 19:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jwforres jwforres jwforres approved these changes

Assignees

@jwforres jwforres

Labels
kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@spadgett @bparees @stevekuznetsov @jwforres @openshift-merge-robot @openshift-ci-robot