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

[7.x] Create our own glog replacement (backport #5809) #5810

Merged
merged 3 commits into from
Jul 28, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 28, 2021

This is an automatic backport of pull request #5809 done by Mergify.
Cherry-pick of 7a5fc06 has failed:

On branch mergify/bp/7.x/pr-5809
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 7a5fc061.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   go.mod
	new file:   internal/glog/glog.go
	new file:   internal/glog/go.mod
	new file:   internal/glog/go.sum
	modified:   script/generate_notice.py
	modified:   tests/Dockerfile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .gitignore
	both modified:   NOTICE.txt
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* Create our own glog replacement

* Fix system tests

(cherry picked from commit 7a5fc06)

# Conflicts:
#	.gitignore
#	NOTICE.txt
#	go.sum
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 28, 2021
@mergify mergify bot assigned axw Jul 28, 2021
@apmmachine
Copy link
Contributor

apmmachine commented Jul 28, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-07-28T02:57:15.031+0000

  • Duration: 42 min 37 sec

  • Commit: 0363b71

Test stats 🧪

Test Results
Failed 0
Passed 4541
Skipped 15
Total 4556

Trends 🧪

Image of Build Times

Image of Tests

@mergify
Copy link
Contributor Author

mergify bot commented Jul 28, 2021

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.x/pr-5809 upstream/mergify/bp/7.x/pr-5809
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-5809

@axw axw removed the conflicts There is a conflict in the backported pull request label Jul 28, 2021
@axw axw enabled auto-merge (squash) July 28, 2021 02:57
@axw axw merged commit b0be201 into 7.x Jul 28, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-5809 branch July 28, 2021 03:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants