Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

[7.16](backport #1764) fix: properly copy files from compose to elastic-package#1766

Merged
mdelapenya merged 2 commits into7.16from
mergify/bp/7.16/pr-1764
Nov 3, 2021
Merged

[7.16](backport #1764) fix: properly copy files from compose to elastic-package#1766
mdelapenya merged 2 commits into7.16from
mergify/bp/7.16/pr-1764

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Nov 3, 2021

This is an automatic backport of pull request #1764 done by Mergify.
Cherry-pick of 293ba96 has failed:

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

You are currently cherry-picking commit 293ba96.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/deploy/elastic_package.go

no changes added to commit (use "git add" and/or "git commit -a")

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/

(cherry picked from commit 293ba96)

# Conflicts:
#	internal/deploy/elastic_package.go
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Nov 3, 2021
@mdelapenya mdelapenya added backport-skip Skip notification from the automated backport with mergify and removed conflicts There is a conflict in the backported pull request labels Nov 3, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

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

  • Duration: 41 min 26 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

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

  • /test : Re-trigger the build.

@mdelapenya mdelapenya merged commit d59824e into 7.16 Nov 3, 2021
@mergify mergify Bot deleted the mergify/bp/7.16/pr-1764 branch November 3, 2021 10:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backport-skip Skip notification from the automated backport with mergify

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants