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

revert WordPress and MySQL PV doc changes to use apps/v1beta2 APIs #5461

Merged
merged 1 commit into from
Sep 14, 2017

Conversation

crimsonfaith91
Copy link
Contributor

@crimsonfaith91 crimsonfaith91 commented Sep 14, 2017

Revert the changes of PR #5424 as the PR targeted the wrong branch.
The auto revert mechanism does not work.


This change is Reviewable

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 14, 2017
@crimsonfaith91
Copy link
Contributor Author

/assign @steveperry-53

@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Sep 14, 2017

Deploy preview ready!

Built with commit 04b2b7c

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

@foxish
Copy link
Contributor

foxish commented Sep 14, 2017

/lgtm
PTAL @steveperry-53

@crimsonfaith91
Copy link
Contributor Author

@steveperry-53 I found out that you merged branch master into release-1.8. I think you can skip this PR when fast-forwarding the changes later on. You can tell me if you fast-forwarded this PR, so that I can send out another PR targeting release-1.8.

@steveperry-53 steveperry-53 merged commit e229c03 into kubernetes:master Sep 14, 2017
@steveperry-53
Copy link
Contributor

steveperry-53 commented Sep 14, 2017

@crimsonfaith91, I'm not sure I know how to skip a PR when fast forwarding. My plan is to merge master into release-1.8 often (every day is the plan).

@crimsonfaith91
Copy link
Contributor Author

Noted - I will send out the PR targeting branch release-1.8 tomorrow or next Monday so that the change can be reflected to the branch eventually.

chenopis added a commit that referenced this pull request Sep 15, 2017
…hub.io into chenopis-user-journeys

* 'master' of https://github.com/kubernetes/kubernetes.github.io: (60 commits)
  fix the command output
  ZTE-SH-CN-run-application-run-single-instance-stateful-application-pr-2017-… (#5363)
  Add a note to static pod manifest scanning
  revert WordPress and MySQL PV doc changes to use apps/v1beta2 APIs (#5461)
  Fix pod probes yaml file
  Redirect v1 docs. (#5460)
  Fix error link (#5459)
  Adds link to Calico install instructions (#5423)
  update wordpress and mysql PV doc to use apps/v1beta2 APIs (#5424)
  Fix init containers code block (#5428)
  Link cassandra statefulset tutorial from the guide (#5446)
  Link to persistent volume tutorial from concept doc (#5447)
  fix typos in /admin/authorization/rbac.md (#5427)
  Typo in environment variable
  Fix typo and examples
  Fix typo in deployment documentation
  Unified use of YAML for Secret example (#5418)
  Remove manual deploy on Ubuntu
  fix typo of configure-volume-storage
  fix the command output
  ...
chenopis added a commit that referenced this pull request Sep 16, 2017
…hub.io into release-1.8

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  ZTE-SH-CN-debug-pod-replication-controller-2017-09-14-14
  ZTE-SH-CN-define-command-argument-container (#5381)
  Update index.md
  Update Kompose docs
  Improve host aliases page (#5443)
  Add link to AlwaysPullImages admission controller
  Revert "create homepage for user journeys"
  create homepage for user journeys
  fix the command output
  ZTE-SH-CN-run-application-run-single-instance-stateful-application-pr-2017-… (#5363)
  Add a note to static pod manifest scanning
  revert WordPress and MySQL PV doc changes to use apps/v1beta2 APIs (#5461)
  Fix pod probes yaml file
  Redirect v1 docs. (#5460)
  Fix error link (#5459)
  Fix typo in deployment documentation

# Conflicts:
#	docs/tutorials/stateful-application/basic-stateful-set.md
chenopis added a commit that referenced this pull request Sep 16, 2017
…hub.io into release-1.7

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  ZTE-SH-CN-debug-pod-replication-controller-2017-09-14-14
  ZTE-SH-CN-define-command-argument-container (#5381)
  Update index.md
  Update Kompose docs
  Improve host aliases page (#5443)
  Add link to AlwaysPullImages admission controller
  Revert "create homepage for user journeys"
  create homepage for user journeys
  fix the command output
  ZTE-SH-CN-run-application-run-single-instance-stateful-application-pr-2017-… (#5363)
  Add a note to static pod manifest scanning
  revert WordPress and MySQL PV doc changes to use apps/v1beta2 APIs (#5461)
  Fix pod probes yaml file
  Redirect v1 docs. (#5460)
  Fix error link (#5459)
  Fix typo in deployment documentation
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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants