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

[8.5](backport #1900) Update apikey.cache_hit log field name to match convention #1950

Merged
merged 3 commits into from
Oct 12, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 5, 2022

This is an automatic backport of pull request #1900 done by Mergify.
Cherry-pick of 95b57a0 has failed:

On branch mergify/bp/8.5/pr-1900
Your branch is up to date with 'origin/8.5'.

You are currently cherry-picking commit 95b57a0.
  (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:   internal/pkg/api/auth.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.next.asciidoc

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.com

(cherry picked from commit 95b57a0)

# Conflicts:
#	CHANGELOG.next.asciidoc
@mergify mergify bot requested a review from a team as a code owner October 5, 2022 11:13
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 5, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented Oct 5, 2022

💚 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: 2022-10-11T09:52:46.795+0000

  • Duration: 11 min 30 sec

Test stats 🧪

Test Results
Failed 0
Passed 352
Skipped 1
Total 353

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@joshdover joshdover removed the conflicts There is a conflict in the backported pull request label Oct 5, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Oct 6, 2022

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/8.5/pr-1900 upstream/mergify/bp/8.5/pr-1900
git merge upstream/8.5
git push upstream mergify/bp/8.5/pr-1900

@mergify
Copy link
Contributor Author

mergify bot commented Oct 10, 2022

This pull request has not been merged yet. Could you please review and merge it @joshdover? 🙏

@joshdover joshdover merged commit 3a5372a into 8.5 Oct 12, 2022
@joshdover joshdover deleted the mergify/bp/8.5/pr-1900 branch October 12, 2022 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants