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

Added new topic #7867

Merged
1 commit merged into from Feb 22, 2018
Merged

Added new topic #7867

1 commit merged into from Feb 22, 2018

Conversation

ghost
Copy link

@ghost ghost commented Feb 20, 2018

This PR attempts to fix the following issues with #7577:

  • Multiple commits which should have been squashed to one commit before merging
  • Not cherry picked to any of the branches
  • Issue with spacing in the topic map file

Trello card: https://trello.com/c/fIJWvdpc/721-document-prevent-pvc-deletion-if-pvc-in-use-by-a-pod

Related PRs:

@ghost ghost added branch/enterprise-3.6 branch/enterprise-3.7 branch/enterprise-3.9 peer-review-needed Signifies that the peer review team needs to review this PR labels Feb 20, 2018
@ghost ghost added this to the Next Release milestone Feb 20, 2018
@ghost ghost self-assigned this Feb 20, 2018
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 20, 2018
@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 20, 2018
@ghost
Copy link
Author

ghost commented Feb 20, 2018

@openshift/team-documentation PTAL.

Copy link

@ncbaratta ncbaratta left a comment

Choose a reason for hiding this comment

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

One tiny comment.

@ncbaratta ncbaratta added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Feb 20, 2018
@ghost
Copy link
Author

ghost commented Feb 22, 2018

Update rev history in:

/install_config/revhistory_install_config.adoc
/welcome/revhistory_full.adoc

@ghost ghost merged commit f1ad26a into openshift:master Feb 22, 2018
@ghost
Copy link
Author

ghost commented Feb 22, 2018

/cherrypick enterprise-3.6

@openshift-cherrypick-robot

@tmorriso-rh: #7867 failed to apply on top of branch "enterprise-3.6":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	architecture/additional_concepts/storage.adoc
A	install_config/configuring_pvc_protection.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): install_config/configuring_pvc_protection.adoc deleted in HEAD and modified in Added new topic. Version Added new topic of install_config/configuring_pvc_protection.adoc left in tree.
Auto-merging architecture/additional_concepts/storage.adoc
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _topic_map.yml
Patch failed at 0001 Added new topic

In response to this:

/cherrypick enterprise-3.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ghost
Copy link
Author

ghost commented Feb 23, 2018

/cherrypick enterprise-3.9

@openshift-cherrypick-robot

@tmorriso-rh: #7867 failed to apply on top of branch "enterprise-3.9":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	architecture/additional_concepts/storage.adoc
A	install_config/configuring_pvc_protection.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): install_config/configuring_pvc_protection.adoc deleted in HEAD and modified in Added new topic. Version Added new topic of install_config/configuring_pvc_protection.adoc left in tree.
Auto-merging architecture/additional_concepts/storage.adoc
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _topic_map.yml
Patch failed at 0001 Added new topic

In response to this:

/cherrypick enterprise-3.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-3.9 peer-review-done Signifies that the peer review team has reviewed this PR 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.

4 participants