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

address additional comments from pr #10259 #10539

Merged
merged 1 commit into from
Oct 10, 2018

Conversation

juanvallejo
Copy link
Contributor

#10422 merged into 1.12 branch.

Picking into master

cc @soltysh

@kubernetes-docs-i18n-bot kubernetes-docs-i18n-bot added the language/en Issues or PRs related to English language label Oct 8, 2018
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 8, 2018
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Oct 8, 2018

Deploy preview for kubernetes-io-master-staging ready!

Built with commit b819e62

https://deploy-preview-10539--kubernetes-io-master-staging.netlify.com

@@ -191,7 +191,7 @@ I am a plugin with a dash in my name

#### Name conflicts and overshadowing

It can be possible to have multiple pluins with the same filename in different locations throughout your PATH.
It can be possible to have multiple plugins with the same filename in different locations throughout your PATH.
Copy link
Contributor

Choose a reason for hiding this comment

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

It is possible

@tengqm
Copy link
Contributor

tengqm commented Oct 9, 2018

A rebase is needed to resolve the conflicts, otherwise this one looks good to me.

Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 9, 2018
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 9, 2018
@juanvallejo
Copy link
Contributor Author

@tengqm Thanks, rebased PR

@tengqm
Copy link
Contributor

tengqm commented Oct 10, 2018

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 10, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tengqm

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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 10, 2018
@k8s-ci-robot k8s-ci-robot merged commit 275c8c6 into kubernetes:master Oct 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants