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

Fix release 1.9 #6686

Merged
merged 152 commits into from
Dec 16, 2017
Merged

Fix release 1.9 #6686

merged 152 commits into from
Dec 16, 2017

Conversation

zacharysarah
Copy link
Contributor

@zacharysarah zacharysarah commented Dec 16, 2017

Reverts a faulty merge causing 1.9 not to build correctly in master.

This PR undoes already accepted changes to:

  • docs/concepts/policy/pod-security-policy.md
  • docs/tasks/debug-application-cluster/audit.md

If this PR is merged, commits to those files that were previously merged into master will have to be cherry-picked into a new PR.


This change is Reviewable

zacharysarah and others added 30 commits October 19, 2017 16:12
This is kind of jarring / missing an article. I'm guessing it should either be ' to a rack of bare metal servers.' or '...to racks of bare metal servers.'.
 - support request
 - code bug report
Fix the not-working test case yaml for /doc/concepts/storage/volumes.md
Some edits for clarity and condensed language.
Fix format.
The url no need. just  highlight.
Fix leading spaces in commands.
I believe this should be "users" not "uses"
guarnatees  to guarantees
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 16, 2017
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Dec 16, 2017

Deploy preview ready!

Built with commit 33b0e35

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

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 16, 2017
@zacharysarah zacharysarah mentioned this pull request Dec 16, 2017
@zacharysarah zacharysarah merged commit 84d14e2 into kubernetes:master Dec 16, 2017
@zacharysarah zacharysarah deleted the fix-release-1.9 branch December 16, 2017 02:32
chenopis added a commit that referenced this pull request Dec 16, 2017
…elease-1.9

* 'master' of https://github.com/kubernetes/website:
  v1.9 patch (#6690)
  Remove 1.9 info from the PR template
  Fix release 1.9 (#6686)
  Release 1.9 (#5978)
  [maintenance] December link fixes (#6680)
  Update audit.md (#6381)
  Fixed typo
  concepts/policy/pod-security-policy.md: fix broken links.
  Fixed a typo `illgal`
  Add glossory entry for ReplicaSet

# Conflicts:
#	docs/tasks/debug-application-cluster/audit.md
chenopis added a commit that referenced this pull request Dec 20, 2017
…henopis-user-journeys

* 'master' of https://github.com/kubernetes/website: (92 commits)
  Update partner-script.js (#6570)
  Update redirects for kubectl commands. (#6706)
  Improve redirection of 1.8 ref docs. (#6705)
  Modify Service Catalog snippet long description
  add prepend option to glossary definition tag
  Mark CPU manager feature as beta for v1.10.
  Balaji, Seth, Connor as CPU manager doc approvers.
  Fix broken link (#6691)
  Clarify that StatefulSet is stable in 1.9 (#6697)
  Update coredns.md (#6698)
  Update preemption document with the new improvements added in 1.9 (#6505)
  v1.9 patch (#6690)
  Remove 1.9 info from the PR template
  Fix release 1.9 (#6686)
  Release 1.9 (#5978)
  [maintenance] December link fixes (#6680)
  Update audit.md (#6381)
  Fixed typo
  concepts/policy/pod-security-policy.md: fix broken links.
  Fixed a typo `illgal`
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.