relink the persistent volume of petset #5582
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
size/XS
|
Deploy preview ready! Built with commit 9a14722 https://deploy-preview-5582--kubernetes-io-master-staging.netlify.com |
|
/assign @zacharysarah |
|
@jianglingxia 👋 Please resolve the merge conflicts in this branch. Thanks! |
jianglingxia
force-pushed
the
jlx-92217
branch
from
59eae3f to
fed9d41
Compare
|
@zacharysarah I have rebased it,for your approve,thanks! |
zacharysarah
suggested changes
Sep 25, 2017
| * Persistent Volume Claim (PVC): A request for storage, typically a [persistent volume](/docs/concepts/storage/persistent-volumes/walkthrough/). | ||
|
|
||
| * Persistent Volume Claim (PVC): A request for storage, typically a [persistent volume](/docs/concepts/storage/persistent-volumes/). | ||
| >>>>>>> relink the persistent volume of petset |
There was a problem hiding this comment.
Please delete this line.
There was a problem hiding this comment.
thanks,I have rebased it!
jianglingxia
force-pushed
the
jlx-92217
branch
from
fed9d41 to
9a14722
Compare
|
It would be good to delete the note and image in template before submitting the pull request in the future :) |
|
OK，thanks for your advice@xiangpengzhao |
zacharysarah
approved these changes
Sep 26, 2017
chenopis
added a commit
that referenced
this pull request
Sep 27, 2017
…hub.io into release-1.8 * 'master' of https://github.com/kubernetes/kubernetes.github.io: (87 commits) fix envFrom in configmap Add link to example for CRDs (#5641) Fixed links to architecture.md and principles.md Polish AppArmor tutorial Remove dangling files related to apparmor fix the typo of serviceaccount (#5533) Correct setup link (#5634) relink the persistent volume of petset (#5582) Updates to case study landing page (#5629) translate doc resource-quotas into chinese minor encoding fix for CN page fix typo concepts-overview-components+abac-fix concepts-overview-components-fix Update links to avoid redirects. (#5627) Update links to avoid redirects. (#5625) Fix 404s. (#5624) Fix 404s. (#5623) Edits cpu-constraint-namespace.md Fix index redirects (#5502) ... # Conflicts: # _redirects # docs/concepts/storage/volumes.md # docs/concepts/workloads/controllers/daemonset.md # docs/concepts/workloads/controllers/petset.md # docs/concepts/workloads/controllers/statefulset.md # docs/tasks/run-application/run-single-instance-stateful-application.md # docs/tutorials/stateful-application/zookeeper.md
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change is