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.

Sign up for GitHub

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

Jump to bottom

BOTMETA.yml: update team_virt #2286

Merged
merged 1 commit into from
Apr 20, 2021
Merged

BOTMETA.yml: update team_virt #2286

merged 1 commit into from
Apr 20, 2021

Conversation

Andersson007
Copy link
Contributor

SUMMARY

#1949 (comment)

ISSUE TYPE
  • Docs Pull Request
COMPONENT NAME

BOTMETA.yml

@Andersson007 Andersson007 mentioned this pull request Apr 20, 2021
Merged
@felixfontein
Copy link
Collaborator

@Ajpantuso can you please approve this PR to confirm?

@joshainglis @karmab @tleguern @Thulium-Drake if you do not want to be informed on changes on the proxmox inventory plugin, please write here!

felixfontein
felixfontein reviewed Apr 20, 2021
View reviewed changes
.github/BOTMETA.yml
@@ -1017,4 +1019,4 @@ macros:
team_scaleway: QuentinBrosse abarbare jerome-quere kindermoumoute remyleone sieben
team_solaris: bcoca fishman jasperla jpdasma mator scathatheworm troy2914 xen0l
team_suse: commel dcermak evrardjp lrupp toabctl AnderEnder alxgu andytom
team_virt: joshainglis karmab Aversiste Thulium-Drake
team_virt: joshainglis karmab Aversiste Thulium-Drake Ajpantuso
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
team_virt: joshainglis karmab Aversiste Thulium-Drake Ajpantuso
team_virt: joshainglis karmab tleguern Thulium-Drake Ajpantuso

While we're at it... :) CC @tleguern

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't see who put the thumbs up:) If it was Tristan, feel free to commit and merge:)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Andersson007 it was you ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hahahah:)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to reply by email but I apparently messed it enough to fail. So yes, I renamed my Github account and I have not yet propagated the change where it needs.

Ajpantuso
Ajpantuso approved these changes Apr 20, 2021
View reviewed changes
Copy link
Collaborator

@Ajpantuso Ajpantuso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks

@ansibullbot ansibullbot added needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR and removed community_review labels Apr 20, 2021
@felixfontein
Copy link
Collaborator

@Andersson007 I'm afraid you need to rebase this PR.

@Andersson007
Copy link
Contributor Author

@felixfontein done, thanks

@ansibullbot ansibullbot added community_review and removed needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR labels Apr 20, 2021
@Andersson007 Andersson007 mentioned this pull request Apr 20, 2021
Merged
@felixfontein felixfontein merged commit fc12eca into ansible-collections:main Apr 20, 2021
@patchback
Copy link

patchback bot commented Apr 20, 2021 •
edited
Loading

Backport to stable-1: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply fc12eca on top of patchback/backports/stable-1/fc12eca65da7d1321932167b6c09f5ede3434edd/pr-2286

Backporting merged PR #2286 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it: 
    $ git add remote upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code: 
    $ git fetch upstream
$ git checkout -b patchback/backports/stable-1/fc12eca65da7d1321932167b6c09f5ede3434edd/pr-2286 upstream/stable-1
  4. Now, cherry-pick PR BOTMETA.yml: update team_virt #2286 contents into that branch: 
    $ git cherry-pick -x fc12eca65da7d1321932167b6c09f5ede3434edd
    If it'll yell at you with something like fatal: Commit fc12eca65da7d1321932167b6c09f5ede3434edd is a merge but no -m option was given., add -m 1 as follows intead: 
    $ git cherry-pick -m1 -x fc12eca65da7d1321932167b6c09f5ede3434edd
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR BOTMETA.yml: update team_virt #2286 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-1/fc12eca65da7d1321932167b6c09f5ede3434edd/pr-2286
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein
Copy link
Collaborator

@Ajpantuso thanks!

@patchback
Copy link

patchback bot commented Apr 20, 2021 •
edited
Loading

Backport to stable-2: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2/fc12eca65da7d1321932167b6c09f5ede3434edd/pr-2286

Backported as #2303

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Apr 20, 2021
@Andersson007
BOTMETA.yml: update team_virt (#2286)
bd5c923 
(cherry picked from commit fc12eca)
@patchback patchback bot mentioned this pull request Apr 20, 2021
Merged
felixfontein pushed a commit that referenced this pull request Apr 20, 2021
@patchback @Andersson007
BOTMETA.yml: update team_virt (#2286) (#2303)
4fa140d 
(cherry picked from commit fc12eca)

Co-authored-by: Andrew Klychkov <[email protected]>
felixfontein pushed a commit to felixfontein/community.general that referenced this pull request Apr 20, 2021
@Andersson007 @felixfontein
BOTMETA.yml: update team_virt (ansible-collections#2286)
19b1a9c 
(cherry picked from commit fc12eca)
@felixfontein felixfontein mentioned this pull request Apr 20, 2021
Merged
@felixfontein
Copy link
Collaborator

Manual backport to stable-1 in #2306.

felixfontein added a commit that referenced this pull request Apr 20, 2021
@felixfontein @Andersson007
[stable-1] Backport of #2286 and #2304 (#2306)
6d804ed 
* BOTMETA.yml: update team_virt (#2286)

(cherry picked from commit fc12eca)

* Update BOTMETA.yml (#2304)

(cherry picked from commit f7928d3)

Co-authored-by: Andrew Klychkov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixfontein felixfontein felixfontein left review comments

@tleguern tleguern tleguern left review comments

@Ajpantuso Ajpantuso Ajpantuso approved these changes

Assignees
No one assigned
Labels
community_review docs needs_triage small_patch Hopefully easy to review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Andersson007 @felixfontein @tleguern @Ajpantuso @ansibullbot