Skip to content

libpod removal from main (phase 2)#3442

Merged
openshift-merge-robot merged 1 commit into
containers:masterfrom
baude:removelibpodfrommainphase2
Jun 27, 2019
Merged

libpod removal from main (phase 2)#3442
openshift-merge-robot merged 1 commit into
containers:masterfrom
baude:removelibpodfrommainphase2

Conversation

@baude
Copy link
Copy Markdown
Member

@baude baude commented Jun 26, 2019

this is phase 2 for the removal of libpod from main.

Signed-off-by: baude bbaude@redhat.com

@openshift-ci-robot
Copy link
Copy Markdown
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: baude

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 26, 2019
Comment thread cmd/podman/logs.go Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

+1

@baude baude force-pushed the removelibpodfrommainphase2 branch 2 times, most recently from e82b38f to 9443aea Compare June 26, 2019 21:22
@TomSweeneyRedHat
Copy link
Copy Markdown
Member

Do you have a gomod/vendor issue?

[21:27:22] END - [+0048s] total duration since START
cd ${GOSRC} && ./hack/tree_status.sh |& ${TIMESTAMP}
[21:27:22] START - All [+xxxx] lines that follow are relative to right now.
[+0000s] tree is dirty, please sync the vendor.conf and commit all changes.
[+0000s] 

@TomSweeneyRedHat
Copy link
Copy Markdown
Member

Changes in general LGTM if you can clean up the vendor/lint fun.

@jwhonce
Copy link
Copy Markdown
Member

jwhonce commented Jun 26, 2019

Assuming vendoring is fixed.

/lgtm
/hold

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. labels Jun 26, 2019
@baude
Copy link
Copy Markdown
Member Author

baude commented Jun 27, 2019

@vrothberg what do i need to do here?

@mheon
Copy link
Copy Markdown
Member

mheon commented Jun 27, 2019 via email

@baude
Copy link
Copy Markdown
Member Author

baude commented Jun 27, 2019

Why is container.go growing log functions? Those either belong in container_api.go or libpod/log.go. Ideally the latter, there are some runtime functions mixed in there.

@mheon Im happy to make that change. thanks

@vrothberg
Copy link
Copy Markdown
Member

@vrothberg what do i need to do here?

cd ${GOSRC} && ./hack/tree_status.sh |& ${TIMESTAMP}
[21:27:22] START - All [+xxxx] lines that follow are relative to right now.
[+0000s] tree is dirty, please sync the vendor.conf and commit all changes.
[+0000s] 
[+0000s]  M vendor/modules.txt

./hack/tree_status.sh is just a git status. The important part is M vendor/modules.txt indicating that this file is modified by make vendor but not committed.

You can fix it with make vendor, git add ./vendor/modules.txt and then commit/push.

this is phase 2 for the removal of libpod from main.

Signed-off-by: baude <bbaude@redhat.com>
@baude baude force-pushed the removelibpodfrommainphase2 branch from 9443aea to 8561b99 Compare June 27, 2019 12:56
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jun 27, 2019
@vrothberg
Copy link
Copy Markdown
Member

LGTM

@vrothberg
Copy link
Copy Markdown
Member

/hold /lgtm

@vrothberg
Copy link
Copy Markdown
Member

/hold
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 27, 2019
@baude
Copy link
Copy Markdown
Member Author

baude commented Jun 27, 2019

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 27, 2019
@openshift-merge-robot openshift-merge-robot merged commit 0906b32 into containers:master Jun 27, 2019
@baude baude deleted the removelibpodfrommainphase2 branch December 22, 2019 19:08
@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 25, 2023
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Sep 25, 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants