Skip to content

Fixes the and removes other networks. (backport #200)#202

Merged
lasarojc merged 2 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-200
Jan 26, 2023
Merged

Fixes the and removes other networks. (backport #200)#202
lasarojc merged 2 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-200

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 25, 2023

This is an automatic backport of pull request #200 done by Mergify.
Cherry-pick of 5d54939 has failed:

On branch mergify/bp/v0.34.x/pr-200
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit 5d5493944.
  (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:   networks/local/localnode/wrapper.sh
	deleted:    networks/remote/ansible/.gitignore
	deleted:    networks/remote/ansible/ansible.cfg
	deleted:    networks/remote/ansible/install.yml
	deleted:    networks/remote/ansible/inventory/COPYING
	deleted:    networks/remote/ansible/inventory/digital_ocean.ini
	deleted:    networks/remote/ansible/inventory/digital_ocean.py
	deleted:    networks/remote/ansible/reset.yml
	deleted:    networks/remote/ansible/restart.yml
	deleted:    networks/remote/ansible/roles/config/tasks/main.yml
	deleted:    networks/remote/ansible/roles/install/handlers/main.yml
	deleted:    networks/remote/ansible/roles/install/tasks/main.yml
	deleted:    networks/remote/ansible/roles/install/templates/systemd.service.j2
	deleted:    networks/remote/ansible/roles/logzio/files/journalbeat.service
	deleted:    networks/remote/ansible/roles/logzio/handlers/main.yml
	deleted:    networks/remote/ansible/roles/logzio/templates/journalbeat.yml.j2
	deleted:    networks/remote/ansible/roles/start/tasks/main.yml
	deleted:    networks/remote/ansible/roles/status/tasks/main.yml
	deleted:    networks/remote/ansible/roles/stop/tasks/main.yml
	deleted:    networks/remote/ansible/roles/unsafe_reset/tasks/main.yml
	deleted:    networks/remote/ansible/start.yml
	deleted:    networks/remote/ansible/status.yml
	deleted:    networks/remote/ansible/stop.yml
	deleted:    networks/remote/integration.sh
	deleted:    networks/remote/terraform/.gitignore
	deleted:    networks/remote/terraform/cluster/main.tf
	deleted:    networks/remote/terraform/cluster/outputs.tf
	deleted:    networks/remote/terraform/cluster/variables.tf
	deleted:    networks/remote/terraform/main.tf

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: docs/networks/terraform-and-ansible.md
	deleted by them: networks/remote/README.md
	deleted by them: networks/remote/ansible/config.yml
	deleted by them: networks/remote/ansible/logzio.yml
	deleted by them: networks/remote/ansible/roles/logzio/tasks/main.yml

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 5d54939)

# Conflicts:
#	docs/networks/terraform-and-ansible.md
#	networks/remote/README.md
#	networks/remote/ansible/config.yml
#	networks/remote/ansible/logzio.yml
#	networks/remote/ansible/roles/logzio/tasks/main.yml
@mergify mergify bot requested a review from a team as a code owner January 25, 2023 19:42
@mergify mergify bot added the conflicts label Jan 25, 2023
@lasarojc lasarojc self-assigned this Jan 26, 2023
@lasarojc
Copy link
Contributor

@Mergifyio update

@mergify
Copy link
Contributor Author

mergify bot commented Jan 26, 2023

update

☑️ Nothing to do

Details
  • #commits-behind>0 [:pushpin: update requirement]
  • -closed [:pushpin: update requirement]

@lasarojc lasarojc merged commit 3351d19 into v0.34.x Jan 26, 2023
@lasarojc lasarojc deleted the mergify/bp/v0.34.x/pr-200 branch January 26, 2023 10:24
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