Skip to content

fix(pick-right-solution.md): Remove conflicts and correct possible grammar error#13930

Merged
k8s-ci-robot merged 2 commits intokubernetes:masterfrom
sr229:patch-1
Apr 22, 2019
Merged

fix(pick-right-solution.md): Remove conflicts and correct possible grammar error#13930
k8s-ci-robot merged 2 commits intokubernetes:masterfrom
sr229:patch-1

Conversation

@sr229
Copy link
Copy Markdown
Contributor

@sr229 sr229 commented Apr 21, 2019

This removes a merge conflict overlooked somehow and fixes a slight grammar mistake in VEXXHOST

@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 cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. 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 2df11bd

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

@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
@sr229
Copy link
Copy Markdown
Contributor Author

sr229 commented Apr 21, 2019

I signed it

@sr229
Copy link
Copy Markdown
Contributor Author

sr229 commented Apr 21, 2019

/assign @Bradamant3

@tengqm
Copy link
Copy Markdown
Contributor

tengqm commented Apr 22, 2019

/lgtm
/approve
Solved conflicts and reordered the list.

@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 b19deca into kubernetes:master Apr 22, 2019
@sr229 sr229 deleted the patch-1 branch April 22, 2019 07:47
nowjean pushed a commit to nowjean/website that referenced this pull request Jun 13, 2019
@nowjean
fix(pick-right-solution.md): Remove conflicts and correct possible Gr…
f9b68b0 
…ammar error (kubernetes#13930)
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

@mikedanese mikedanese Awaiting requested review from mikedanese

Assignees

@tengqm tengqm

@Bradamant3 Bradamant3

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.

4 participants

@sr229 @k8s-ci-robot @tengqm @Bradamant3