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.

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

vendor buildah, image, storage, cni #2789

Merged
merged 1 commit into from
Mar 28, 2019
Merged

vendor buildah, image, storage, cni #2789

merged 1 commit into from
Mar 28, 2019

Conversation

vrothberg
Copy link
Member

Signed-off-by: Valentin Rothberg [email protected]

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vrothberg

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

The pull request process is described here

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 28, 2019
@vrothberg
Copy link
Member Author

This PR is blocked by cri-o/ocicni#27.

@vrothberg vrothberg force-pushed the vendor branch 3 times, most recently from 31fbde1 to 395689a Compare March 28, 2019 12:45
@vrothberg
Copy link
Member Author

Note that storage.DefaultStoreOptions(rootless.IsRootless(), rootless.GetRootlessUID()) is called a few times across the stack and I am certain this can be refactored into a single call somewhere but I defer that to future refactorings.

@rhatdan
Copy link
Member

rhatdan commented Mar 28, 2019

👍

@mheon
Copy link
Member

mheon commented Mar 28, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 28, 2019
@rh-atomic-bot
Copy link
Collaborator

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

@vrothberg
vendor buildah, image, storage, cni
a5443a5 
Signed-off-by: Valentin Rothberg <[email protected]>
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 28, 2019
@mheon
Copy link
Member

mheon commented Mar 28, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 28, 2019
@openshift-merge-robot openshift-merge-robot merged commit ef1b58e into containers:master Mar 28, 2019
This was referenced Mar 28, 2019
Merged
Closed
@vrothberg vrothberg deleted the vendor branch March 28, 2019 14:20
This was referenced Mar 28, 2019
Merged
Merged
Closed
Closed
@TomSweeneyRedHat
Copy link
Member

Just a note that we should merge Buildah to v1.7.2 before spinning up the next Podman release.

@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.
Reviewers

@giuseppe giuseppe Awaiting requested review from giuseppe

@umohnani8 umohnani8 Awaiting requested review from umohnani8

Assignees

@mheon mheon

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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@vrothberg @openshift-ci-robot @rhatdan @mheon @rh-atomic-bot @TomSweeneyRedHat @openshift-merge-robot