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

Update documentation to remove adhoc and playbook refs #870

Merged
merged 1 commit into from
Oct 18, 2021

Conversation

Shrews
Copy link
Contributor

@Shrews Shrews commented Oct 14, 2021

Remove remaining references to the adhoc and playbook subcommands that were previously removed.

Fixes: #753

@Shrews Shrews requested a review from a team as a code owner October 14, 2021 19:12
@samdoran samdoran added the gate label Oct 18, 2021
Copy link
Contributor

@ansible-zuul ansible-zuul bot left a comment

Choose a reason for hiding this comment

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

LGTM!

@ansible-zuul ansible-zuul bot merged commit c254516 into ansible:devel Oct 18, 2021
@Shrews Shrews deleted the doc-updates branch October 18, 2021 22:05
@patchback
Copy link

patchback bot commented Oct 19, 2021

Backport to release_2.1: 💚 backport PR created

✅ Backport PR branch: patchback/backports/release_2.1/c254516d1fc96cc8cc26661f30f127da5d28691d/pr-870

Backported as #875

🤖 @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 Oct 19, 2021
Update documentation to remove adhoc and playbook refs

Remove remaining references to the adhoc and playbook subcommands that were previously removed.
Fixes: #753

Reviewed-by: Sam Doran <sdoran@redhat.com>
Reviewed-by: None <None>
(cherry picked from commit c254516)
ansible-zuul bot added a commit that referenced this pull request Oct 19, 2021
…c254516d1fc96cc8cc26661f30f127da5d28691d/pr-870

[PR #870/c254516d backport][release_2.1] Update documentation to remove adhoc and playbook refs

This is a backport of PR #870 as merged into devel (c254516).
Remove remaining references to the adhoc and playbook subcommands that were previously removed.
Fixes: #753

Reviewed-by: David Shrewsbury <None>
Reviewed-by: None <None>
@patchback
Copy link

patchback bot commented Oct 20, 2021

Backport to release_2.0: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply c254516 on top of patchback/backports/release_2.0/c254516d1fc96cc8cc26661f30f127da5d28691d/pr-870

Backporting merged PR #870 into devel

  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 remote add upstream https://github.com/ansible/ansible-runner.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/release_2.0/c254516d1fc96cc8cc26661f30f127da5d28691d/pr-870 upstream/release_2.0
  4. Now, cherry-pick PR Update documentation to remove adhoc and playbook refs #870 contents into that branch:
    $ git cherry-pick -x c254516d1fc96cc8cc26661f30f127da5d28691d
    If it'll yell at you with something like fatal: Commit c254516d1fc96cc8cc26661f30f127da5d28691d is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x c254516d1fc96cc8cc26661f30f127da5d28691d
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Update documentation to remove adhoc and playbook refs #870 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/release_2.0/c254516d1fc96cc8cc26661f30f127da5d28691d/pr-870
  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.

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.

Documentation needs updated with removal of adhoc and playbook commands.
2 participants