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

Storage class 1.4 docs #1243

Merged
merged 2 commits into from
Sep 16, 2016

Conversation

wongma7
Copy link
Contributor

@wongma7 wongma7 commented Sep 16, 2016

Ideally this should not need a review because it is simply reverting a revert in the release-1.4 branch. Bear with me... The first commit is #1064 and the second commit is #1121. Only, this time I am targeting them at the correct branch, 1.4.

  1. StorageClass docs intended for 1.4 got merged into master (my bad)
  2. I reverted the docs in master yesterday
  3. Latest changes in master got merged into release-1.4
  4. Now I am putting the StorageClass docs back into release-1.4

This change is Reviewable

@wongma7
Copy link
Contributor Author

wongma7 commented Sep 16, 2016

Both #1233 and #1226 depend on this PR

@jsafrane
Copy link
Member

looks the same as before, therefore lgtm from my side.

@devin-donnelly devin-donnelly merged commit c251733 into kubernetes:release-1.4 Sep 16, 2016
mikutas pushed a commit to mikutas/k8s-website that referenced this pull request Sep 22, 2022
Currently the shown example of a Ingress resource with the service-upstream
annotation is invalid in that the annotations value is a boolean where only
string values are allowed.

This change updates the example to be valid.

Signed-off-by: Crevil <bjoern.soerensen@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants