Skip to content

Vendor in latest containers/storage and containers/buildah#3016

Merged
openshift-merge-robot merged 2 commits intocontainers:masterfrom
rhatdan:vendor
Apr 29, 2019
Merged

Vendor in latest containers/storage and containers/buildah#3016
openshift-merge-robot merged 2 commits intocontainers:masterfrom
rhatdan:vendor

Conversation

@rhatdan
Copy link
Copy Markdown
Member

@rhatdan rhatdan commented Apr 25, 2019

Should fix the issue on Windows platform.

Lots of other fixes and enhancements.

Signed-off-by: Daniel J Walsh dwalsh@redhat.com

@openshift-ci-robot
Copy link
Copy Markdown
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M labels Apr 25, 2019
@mheon
Copy link
Copy Markdown
Member

mheon commented Apr 25, 2019

LGTM

@rh-atomic-bot
Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #3023) made this pull request unmergeable. Please resolve the merge conflicts.

Should fix the issue on Windows platform.

Lots of other fixes and enhancements.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@rhatdan rhatdan changed the title Vendor in latest containers/storage Vendor in latest containers/storage and containers/buildah Apr 26, 2019
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@rhatdan
Copy link
Copy Markdown
Member Author

rhatdan commented Apr 28, 2019

@cevich
Copy link
Copy Markdown
Member

cevich commented Apr 29, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 29, 2019
@TomSweeneyRedHat
Copy link
Copy Markdown
Member

LGTM assuming happy tests.

@openshift-merge-robot openshift-merge-robot merged commit 627bfd0 into containers:master Apr 29, 2019
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 26, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants