-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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.17](backport #32251) automate the ironbank docker context generation #32419
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit e41dc18) # Conflicts: # .ci/packaging.groovy # dev-tools/mage/pkg.go # x-pack/winlogbeat/magefile.go
mergify
bot
added
the
conflicts
There is a conflict in the backported pull request
label
Jul 20, 2022
botelastic
bot
added
the
needs_team
Indicates that the issue/PR needs a Team:* label
label
Jul 20, 2022
v1v
reviewed
Jul 20, 2022
dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml
Outdated
Show resolved
Hide resolved
dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml
Outdated
Show resolved
Hide resolved
dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml
Outdated
Show resolved
Hide resolved
dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml
Outdated
Show resolved
Hide resolved
v1v
reviewed
Jul 20, 2022
v1v
reviewed
Jul 20, 2022
dev-tools/mage/pkg.go
Outdated
Comment on lines
121
to
122
<<<<<<< HEAD | ||
======= |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
<<<<<<< HEAD | |
======= |
v1v
reviewed
Jul 20, 2022
Collaborator
mergify
bot
requested review from
ph and
blakerouse
and removed request for
a team
July 21, 2022 08:00
v1v
added
automation
Team:Automation
Label for the Observability productivity team
and removed
conflicts
There is a conflict in the backported pull request
labels
Jul 21, 2022
botelastic
bot
removed
the
needs_team
Indicates that the issue/PR needs a Team:* label
label
Jul 21, 2022
/test |
Test
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #32251 done by Mergify.
Cherry-pick of e41dc18 has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com