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

Adding Tenxcloud as KCSP and Hedvig typo #7826

Merged
merged 1 commit into from
Mar 23, 2018
Merged

Adding Tenxcloud as KCSP and Hedvig typo #7826

merged 1 commit into from
Mar 23, 2018

Conversation

kbarnard10
Copy link
Contributor

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
For 1.10 Features: set Milestone to 1.10 and Base Branch to release-1.10
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
NOTE: After opening the PR, please un-check and re-check the "Allow edits from maintainers" box so that maintainers can work on your patch and speed up the review process. This is a temporary workaround to address a known issue with GitHub.>

Please delete this note before submitting the pull request.

Allow edits from maintainers checkbox

@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 Mar 23, 2018
@k8sio-netlify-preview-bot
Copy link
Collaborator

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

Built with commit 2beb1ed

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

@kbarnard10
Copy link
Contributor Author

cc // @zacharysarah - trying to sneak this fix in before code freeze.

Copy link
Contributor

@zacharysarah zacharysarah left a comment

Choose a reason for hiding this comment

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

One small change, can be fixed after freeze if necessary

name: 'TenxCloud',
logo: 'tenxcloud',
link: 'https://www.tenxcloud.com/',
blurb: 'Founded in October 2014, TenxCloud is a leading enterprise container cloud computing service provider in China, covering the areas such as container PaaS cloud platform, micro-service management, DevOps, development test, AIOps and so on. Provide private cloud PaaS products and solutions for financial, energy, operator, manufacturing, education and other industry customers.'
Copy link
Contributor

Choose a reason for hiding this comment

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

“covering areas like”

@zacharysarah
Copy link
Contributor

/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 Mar 23, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zacharysarah

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 Mar 23, 2018
@k8s-ci-robot k8s-ci-robot merged commit 9f5b5c5 into kubernetes:master Mar 23, 2018
chenopis added a commit that referenced this pull request Mar 27, 2018
…elease-1.9

* 'master' of https://github.com/kubernetes/website: (549 commits)
  Update service.md (#7810)
  Prune inactive maintainers (#7830)
  add Amadeus to index page and add feature image (#7827)
  Update conventions.md (#7668)
  Adding Tenxcloud as KCSP and Hedvig typo (#7826)
  Update outdated documentation about secret key validation. (#7675)
  Update imperative-command.md (#7699)
  Update manage-deployment.md (#7774)
  Add the OCI runtime description. (#7769)
  fix flag (#7814)
  fix flag (#7813)
  Add files via upload (#7816)
  Remove CoreOS guide that use Kubernetes v0.15.0 (#7821)
  "Nagions" should be "Nagios“ (#7762)
  Update docker-cli-to-kubectl.md (#7748)
  adjust a note format (#7812)
  add a note when mount a configmap to pod (#7745)
  Make using sysctls a task instead of a concept (#6808)
  Partners page updates (#7802)
  Fix a missing word in endpoint reconciler section (#7804)
  ...
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. 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.

None yet

4 participants