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

How to clear cache after pruning images 4.3 #17966

Merged
merged 1 commit into from
Dec 20, 2019

Conversation

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 7, 2019
@mburke5678
Copy link
Contributor Author

@adambkaplan @wking PTAL

@openshift-docs-preview-bot

The preview will be available shortly at:

@mburke5678
Copy link
Contributor Author

Depends on openshift/oc#169

@mburke5678
Copy link
Contributor Author

@tnozicka @adambkaplan
I believe the PR to add oc rolling restart has merged. Can you confirm if this PR will now work?

@wzheng1 PTAL

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 5, 2019
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 5, 2019
@mburke5678
Copy link
Contributor Author

@wzheng1 PTAL

@wzheng1
Copy link

wzheng1 commented Dec 20, 2019

LGTM

@mburke5678
Copy link
Contributor Author

@wzheng1 Thank you very much for your quick review!

@mburke5678 mburke5678 merged commit d308a0b into openshift:master Dec 20, 2019
@mburke5678 mburke5678 deleted the BZ-1730148-43 branch December 20, 2019 16:06
@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.3

@openshift-cherrypick-robot

@mburke5678: #17966 failed to apply on top of branch "enterprise-4.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	modules/pruning-images.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/pruning-images.adoc
CONFLICT (content): Merge conflict in modules/pruning-images.adoc
Patch failed at 0001 How to clear cache after pruning images 4.3

In response to this:

/cherrypick enterprise-4.3

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.3 size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants