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 Azure Container Service to managed clusters #6955

Merged
merged 1 commit into from
Feb 6, 2018
Merged

Update Azure Container Service to managed clusters #6955

merged 1 commit into from
Feb 6, 2018

Conversation

gsacavdm
Copy link
Contributor

@gsacavdm gsacavdm commented Jan 14, 2018 •
edited by k8s-reviewable
Loading

This change is Reviewable

@k8s-ci-robot
Copy link
Contributor

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.

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. labels Jan 14, 2018
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Jan 14, 2018 •
edited
Loading

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

Built with commit 94f9d1b

https://deploy-preview-6955--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 Jan 31, 2018
@steveperry-53
Copy link
Contributor

/approve
/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gsacavdm, steveperry-53

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your 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 Jan 31, 2018
@heckj
Copy link
Contributor

heckj commented Feb 1, 2018

/hold
@steveperry-53 looks like this needs a rebase - was jamming up the queue for merging other PR’s, so I tacked a /hold on it - please remove it whenever you’re good with the rebase, hoping that will pause tide on this PR and let it merge in the others that are pending

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 1, 2018
@heckj
Copy link
Contributor

heckj commented Feb 1, 2018

Erp, @gsacavdm sorry - should have addressed you directly. Could you give this a rebase and resolve against the current master? Totally good with letting it go in, but there’s a conflicting file right now that doesn’t merge cleanly (/docs/setup/pick-right-solution.md)

@heckj heckj mentioned this pull request Feb 1, 2018
Closed
@gsacavdm
Copy link
Contributor Author

gsacavdm commented Feb 5, 2018

@heckj , done. Should be good to merge now, right?

@heckj
Copy link
Contributor

heckj commented Feb 6, 2018

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 6, 2018
@k8s-ci-robot k8s-ci-robot merged commit d581dff into kubernetes:master Feb 6, 2018
@gsacavdm gsacavdm deleted the patch-1 branch February 6, 2018 17:29
chenopis added a commit that referenced this pull request Feb 8, 2018
@chenopis
Merge branch 'master' of https://github.com/kubernetes/website into i18n
ebd3f64 
* 'master' of https://github.com/kubernetes/website: (379 commits)
  fix some typos in keps.md (#7266)
  Typo fix: recommend -> recommended (#7271)
  Update nodes.md (#7288)
  Fix patch image command in rolling update section (#7124)
  fix edx link (#7276)
  Update OWNERS_ALIASES for sig-openstack (#7280)
  Update ISSUE_TEMPLATE.md (#7284)
  Add Brad Topol to owner aliases. (#7246)
  modify the default update strategy of statefulset (#7270)
  Fix tags of workloads-related glossary (#7102)
  kubectl 1.9+ updated registry secret type and datakey: .dockercfg is now .dockerconfigjson, and datakey now wrapped in 'auths' element (#7248)
  Remove CentOS guide that was already deprecated a while ago (#7242)
  fix typo (#7260)
  fix typo envrionment -> [environment] (#7262)
  fix a typo in kubernetes api (#7261)
  fix some typos (#7251)
  Update notes.md (#7259)
  Update notes.md (#7257)
  Fix file extension and remove not necessary sudo. (#7143)
  Update Azure Container Service to managed clusters (#6955)
  ...
tehut pushed a commit to tehut/website that referenced this pull request Feb 20, 2018
@gsacavdm @tehut
Update Azure Container Service to managed clusters (kubernetes#6955)
ae8f0d3
bsalamat pushed a commit to bsalamat/kubernetes.github.io that referenced this pull request Feb 23, 2018
@gsacavdm @bsalamat
Update Azure Container Service to managed clusters (kubernetes#6955)
68bfeb4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tengqm tengqm tengqm approved these changes

Assignees

@steveperry-53 steveperry-53

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. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@gsacavdm @k8s-ci-robot @k8sio-netlify-preview-bot @steveperry-53 @heckj @tengqm