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

Unify fleet and stand-alone suites (backport #1112)#1132

Closed
mergify[bot] wants to merge 1 commit into7.13.xfrom
mergify/bp/7.13.x/pr-1112
Closed

Unify fleet and stand-alone suites (backport #1112)#1132
mergify[bot] wants to merge 1 commit into7.13.xfrom
mergify/bp/7.13.x/pr-1112

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 5, 2021

This is an automatic backport of pull request #1112 done by Mergify.
Cherry-pick of 77a2c55 has failed:

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

You are currently cherry-picking commit 77a2c554.
  (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:   e2e/_suites/fleet/ingest_manager_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   e2e/_suites/fleet/features/apm_integration.feature
	both modified:   e2e/_suites/fleet/fleet.go
	both modified:   e2e/_suites/fleet/stand-alone.go
	both modified:   e2e/_suites/fleet/world.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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/

* fix agent uninstall

* unify fleet and stand alone suites

* move things around a bit more

* fixe bad merge

* simplify some things

(cherry picked from commit 77a2c55)

# Conflicts:
#	e2e/_suites/fleet/features/apm_integration.feature
#	e2e/_suites/fleet/fleet.go
#	e2e/_suites/fleet/stand-alone.go
#	e2e/_suites/fleet/world.go
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label May 5, 2021
@mergify mergify Bot assigned jalvz May 5, 2021
@mdelapenya mdelapenya closed this May 5, 2021
@mergify mergify Bot deleted the mergify/bp/7.13.x/pr-1112 branch May 5, 2021 05:50
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants