Skip to content

Remove merge conflict #13941#13942

Merged
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
MiloATH:master
Apr 22, 2019
Merged

Remove merge conflict #13941#13942
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
MiloATH:master

Conversation

@MiloATH
Copy link
Copy Markdown
Contributor

@MiloATH MiloATH commented Apr 21, 2019

Remove merge conflict that was committed. #13941

Also, relevant #13733

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Apr 21, 2019

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Apr 21, 2019
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. language/en Issues or PRs related to English language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Apr 21, 2019
@netlify
Copy link
Copy Markdown

netlify bot commented Apr 21, 2019 •
edited
Loading

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

Built with commit 04c29e2

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

@MiloATH MiloATH force-pushed the master branch 3 times, most recently from fe442c1 to 4deaed4 Compare April 21, 2019 23:29
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Apr 21, 2019
@MiloATH
Copy link
Copy Markdown
Contributor Author

MiloATH commented Apr 21, 2019

Issue introduced in a42f81c.
Commit could be reverted, but links would still need to be updated.

@tengqm
Copy link
Copy Markdown
Contributor

tengqm commented Apr 22, 2019

/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 Apr 22, 2019
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Apr 22, 2019

[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

Details 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 Apr 22, 2019
@k8s-ci-robot k8s-ci-robot merged commit 5ce09cd into kubernetes:master Apr 22, 2019
nowjean pushed a commit to nowjean/website that referenced this pull request Jun 13, 2019
@MiloATH @nowjean
Remove merge conflict kubernetes#13941 (kubernetes#13942)
3094f7f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brendandburns brendandburns Awaiting requested review from brendandburns

@erictune erictune Awaiting requested review from erictune

Assignees

@tengqm tengqm

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. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@MiloATH @k8s-ci-robot @tengqm