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

Revert "Removed a force conditional (#28851)" #32282

Merged
merged 1 commit into from
Oct 28, 2017
Merged

Revert "Removed a force conditional (#28851)" #32282

merged 1 commit into from
Oct 28, 2017

Conversation

abadger
Copy link
Contributor

@abadger abadger commented Oct 28, 2017

This reverts commit 07acc57.

On closer examination of this code, the conditional that had force in it
was not a parent of this one. So handling of force is needed i both
branches.

See the recent comments on #23391

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

lib/ansible/cligalaxy.py

ANSIBLE VERSION
devel, 2.4

@abadger
Revert "Removed a force conditional (ansible#28851)"
8456df9 
This reverts commit 07acc57.

On closer examination of this code, the conditional that had force in it
was not a parent of this one.  So handling of force is needed i both
branches.

See the recent comments on ansible#23391
@ansibot ansibot added affects_2.5 This issue/PR affects Ansible v2.5 bugfix_pull_request cli/galaxy needs_triage Needs a first human triage before being processed. support:core This issue/PR relates to code supported by the Ansible Engineering Team. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Oct 28, 2017
@ansibot ansibot removed the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. label Oct 28, 2017
@jborean93 jborean93 merged commit 2e12a5f into ansible:devel Oct 28, 2017
@abadger abadger deleted the we-need-the-force branch October 28, 2017 14:29
abadger added a commit that referenced this pull request Oct 28, 2017
@abadger
Revert "Removed a force conditional (#28851)" (#32282)
fdcb419 
This reverts commit 07acc57.

On closer examination of this code, the conditional that had force in it
was not a parent of this one.  So handling of force is needed i both
branches.

See the recent comments on #23391
(cherry picked from commit 2e12a5f)
@abadger
Copy link
Contributor Author

abadger commented Oct 28, 2017

Merged to stable-2.4 for the 2.4.2beta2 release.

@bcoca bcoca removed the needs_triage Needs a first human triage before being processed. label Oct 30, 2017
@ansibot ansibot added bug This issue/PR relates to a bug. and removed bugfix_pull_request labels Mar 6, 2018
@ansible ansible locked and limited conversation to collaborators Apr 26, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jborean93 jborean93 jborean93 approved these changes

Assignees
No one assigned
Labels
affects_2.5 This issue/PR affects Ansible v2.5 bug This issue/PR relates to a bug. cli/galaxy support:core This issue/PR relates to code supported by the Ansible Engineering Team.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@abadger @jborean93 @bcoca @ansibot