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

vagrant-box atomic-host -> stream9 (backport #7581) #7582

Merged
merged 1 commit into from
Aug 5, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 16, 2024


This is an automatic backport of pull request #7581 done by [Mergify](https://mergify.com).

Copy link
Author

mergify bot commented Jul 16, 2024

Cherry-pick of f1b67bd has failed:

On branch mergify/bp/stable-7.0/pr-7581
Your branch is up to date with 'origin/stable-7.0'.

You are currently cherry-picking commit f1b67bd4d.
  (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:   tests/functional/add-mons/container/vagrant_variables.yml
	modified:   tests/functional/add-mons/vagrant_variables.yml
	modified:   tests/functional/lvm-auto-discovery/container/vagrant_variables.yml
	modified:   tests/functional/lvm-batch/container/vagrant_variables.yml
	modified:   tests/functional/lvm-osds/container/vagrant_variables.yml
	modified:   tests/functional/podman/vagrant_variables.yml
	modified:   tests/functional/rbdmirror/container/secondary/vagrant_variables.yml
	modified:   tests/functional/rbdmirror/container/vagrant_variables.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/functional/all-in-one/container/vagrant_variables.yml
	both modified:   tests/functional/all_daemons/container/vagrant_variables.yml
	both modified:   tests/functional/all_daemons_ipv6/container/vagrant_variables.yml
	both modified:   tests/functional/collocation/container/vagrant_variables.yml
	both modified:   tests/functional/external_clients/container/vagrant_variables.yml
	both modified:   tests/functional/shrink_mds/container/vagrant_variables.yml
	both modified:   tests/functional/shrink_mgr/container/vagrant_variables.yml
	both modified:   tests/functional/shrink_mon/container/vagrant_variables.yml
	both modified:   tests/functional/shrink_osd/container/vagrant_variables.yml
	both modified:   tests/functional/shrink_rbdmirror/container/vagrant_variables.yml
	both modified:   tests/functional/shrink_rgw/container/vagrant_variables.yml
	both modified:   tests/functional/subset_update/container/vagrant_variables.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Jul 16, 2024
@asm0deuz asm0deuz force-pushed the mergify/bp/stable-7.0/pr-7581 branch 3 times, most recently from 0657a93 to 083355b Compare July 17, 2024 08:32
@asm0deuz
Copy link
Collaborator

jenkins test centos-container-update

@asm0deuz
Copy link
Collaborator

jenkins test centos-non_container-update

1 similar comment
@asm0deuz
Copy link
Collaborator

jenkins test centos-non_container-update

@asm0deuz
Copy link
Collaborator

jenkins test centos-container-lvm_batch

Signed-off-by: Teoman ONAY <[email protected]>
(cherry picked from commit f1b67bd)
@asm0deuz asm0deuz force-pushed the mergify/bp/stable-7.0/pr-7581 branch from 083355b to 14802a9 Compare July 23, 2024 13:22
@asm0deuz
Copy link
Collaborator

asm0deuz commented Aug 1, 2024

jenkins test centos-container-update

1 similar comment
@asm0deuz
Copy link
Collaborator

asm0deuz commented Aug 2, 2024

jenkins test centos-container-update

@asm0deuz
Copy link
Collaborator

asm0deuz commented Aug 2, 2024

jenkins test centos-non_container-update

@guits guits merged commit 1462f57 into stable-7.0 Aug 5, 2024
26 of 27 checks passed
@guits guits deleted the mergify/bp/stable-7.0/pr-7581 branch August 5, 2024 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants