Skip to content

Add edits to PR 8990 #9645

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.

Sign up for GitHub

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

Jump to bottom
Merged
1 commit merged into from Jun 4, 2018
Merged

Add edits to PR 8990 #9645

1 commit merged into from Jun 4, 2018

Conversation

ghost
Copy link

@ghost ghost commented May 29, 2018

Follow up to: #8990

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 29, 2018
@ghost ghost self-assigned this May 29, 2018
@ghost ghost added to_followup and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 29, 2018
@ghost ghost mentioned this pull request May 29, 2018
Merged
@ghost
Copy link
Author

ghost commented May 29, 2018

@qinpingli Can you sign off on this PR for QE? I made a few additional edits on top of the merged content.

Cc: @gnufied

@ghost ghost added this to the Next Release milestone May 29, 2018
@ghost
Copy link
Author

ghost commented May 29, 2018

Merge and then CP to 3.9 and 3.10.

@gnufied
Copy link
Member

gnufied commented May 29, 2018

LGTM

@ghost ghost added peer-review-needed Signifies that the peer review team needs to review this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR to_followup labels Jun 4, 2018
@ghost ghost merged commit 8f86ab0 into openshift:master Jun 4, 2018
@ghost
Copy link
Author

ghost commented Jun 4, 2018

/cherrypick enterprise-3.10

@openshift-cherrypick-robot
Copy link

@tmorriso-rh: #9645 failed to apply on top of branch "enterprise-3.10":

.git/rebase-apply/patch:28: trailing whitespace.
afterwards, whenever needed, you can edit the PVC and request a new size. 
warning: 1 line adds whitespace errors.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	dev_guide/expanding_persistent_volumes.adoc
Falling back to patching base and 3-way merge...
Auto-merging dev_guide/expanding_persistent_volumes.adoc
CONFLICT (content): Merge conflict in dev_guide/expanding_persistent_volumes.adoc
Patch failed at 0001 Add edits to PR 8990

In response to this:

/cherrypick enterprise-3.10

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 ghost mentioned this pull request Jun 4, 2018
Merged
@ghost
Copy link
Author

ghost commented Jun 4, 2018

/cherrypick enterprise-3.9

@openshift-cherrypick-robot
Copy link

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

.git/rebase-apply/patch:28: trailing whitespace.
afterwards, whenever needed, you can edit the PVC and request a new size. 
warning: 1 line adds whitespace errors.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	dev_guide/expanding_persistent_volumes.adoc
Falling back to patching base and 3-way merge...
Auto-merging dev_guide/expanding_persistent_volumes.adoc
CONFLICT (content): Merge conflict in dev_guide/expanding_persistent_volumes.adoc
Patch failed at 0001 Add edits to PR 8990

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.

@ghost ghost mentioned this pull request Jun 4, 2018
Merged
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
branch/enterprise-3.9 branch/enterprise-3.10
Projects
None yet
Milestone
Next Release
Development

Successfully merging this pull request may close these issues.
3 participants
@gnufied @openshift-cherrypick-robot @openshift-ci-robot