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

Improves STD output/readability in combination #3530

Merged
merged 1 commit into from
Jul 14, 2019
Merged

Improves STD output/readability in combination #3530

merged 1 commit into from
Jul 14, 2019

Conversation

dofinn
Copy link
Contributor

@dofinn dofinn commented Jul 9, 2019

Improves standard output with debug output.

Added \n char to specific standard output

Closes #3490

Signed-off-by: dom finn dom.finn00@gmail.com

@openshift-ci-robot openshift-ci-robot added size/XS needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 9, 2019
@openshift-ci-robot
Copy link
Collaborator

Hi @deefin. Thanks for your PR.

I'm waiting for a containers or openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@rh-atomic-bot
Copy link
Collaborator

Can one of the admins verify this patch?
I understand the following commands:

  • bot, add author to whitelist
  • bot, test pull request
  • bot, test pull request once

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @deefin

@vrothberg
Copy link
Member

bot, test pull request

@mheon
Copy link
Member

mheon commented Jul 9, 2019

/ok-to-test

@openshift-ci-robot openshift-ci-robot added ok-to-test and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 9, 2019
@mheon
Copy link
Member

mheon commented Jul 9, 2019

This LGTM

@mheon
Copy link
Member

mheon commented Jul 9, 2019

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deefin, mheon

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 9, 2019
@mheon
Copy link
Member

mheon commented Jul 10, 2019

@deefin Can you rebase? There's a fix for the tests on master

@rh-atomic-bot
Copy link
Collaborator

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

@openshift-ci-robot openshift-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 11, 2019
@rhatdan
Copy link
Member

rhatdan commented Jul 12, 2019

/ok-to-test

@rhatdan
Copy link
Member

rhatdan commented Jul 12, 2019

@deefin you need to rebase your PR.

git pull origin master
git rebase -i origin
git push --force

Then we can merge.

@rh-atomic-bot
Copy link
Collaborator

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

@dofinn
Copy link
Contributor Author

dofinn commented Jul 14, 2019

@rhatdan Thanks,

I previously just tried to merge as seen below:

git branch
git remote show
git fetch upstream --all
git status
git log
git merge upstream/master
git add libpod/image/pull.go
git status
git commit
git push origin deefin-3490-logging

In respect the below config:

$ git remote -v
origin	git@github.com:deefin/libpod.git (fetch)
origin	git@github.com:deefin/libpod.git (push)
upstream	git@github.com:containers/libpod (fetch)
upstream	git@github.com:containers/libpod (push)

Should the commands you gave me be?

git pull upstream master
git rebase -i upstream
git push --force

@mheon
Copy link
Member

mheon commented Jul 14, 2019

Generally I use git fetch upstream; git rebase upstream/master; git push --force origin $BRANCH_NAME

with debug output.

Added \n char to specific standard output

Signed-off-by: dom finn <dom.finn00@gmail.com>
@dofinn
Copy link
Contributor Author

dofinn commented Jul 14, 2019

Thanks @mheon.

Please excuse my giteracy (git literacy)

Its looking better now from what i can see.

@rhatdan
Copy link
Member

rhatdan commented Jul 14, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 14, 2019
@openshift-merge-robot openshift-merge-robot merged commit 456b6ab into containers:master Jul 14, 2019
@dofinn dofinn deleted the deefin-3490-logging branch July 18, 2019 12:23
@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. ok-to-test
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pull: add new line after Trying to pull $image...
7 participants