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

docker_service: parse scale parameter correctly to 2.7 #47239

Merged
merged 2 commits into from
Oct 22, 2018

Conversation

danihodovic
Copy link
Contributor

SUMMARY

Backporting #45508 to 2.7.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

docker_service

ANSIBLE VERSION
ADDITIONAL INFORMATION

@danihodovic danihodovic changed the title docker_service: parse scale parameter correctly 2.7 docker_service: parse scale parameter correctly to 2.7 Oct 17, 2018
@danihodovic
Copy link
Contributor Author

@felixfontein @jwitko mind having a look at this one :) ?

@ansibot
Copy link
Contributor

ansibot commented Oct 17, 2018

Hi @danihodovic, thank you for submitting this pull-request!

click here for bot help

@ansibot
Copy link
Contributor

ansibot commented Oct 17, 2018

@ansibot ansibot added affects_2.8 This issue/PR affects Ansible v2.8 bug This issue/PR relates to a bug. cloud community_review In order to be merged, this PR must follow the community review workflow. docker module This issue/PR relates to a module. needs_triage Needs a first human triage before being processed. support:community This issue/PR relates to code supported by the Ansible community. labels Oct 17, 2018
@jwitko
Copy link
Contributor

jwitko commented Oct 17, 2018

@danihodovic Maybe this just needs a rebase but I'm seeing changes in this PR that are identical to #45508 ?

Edit: I'm seeing that this is clearly meant to be a back-port, but I'm unclear on how that works? to me it looks like identical changes being merged in to the same devel branch ?

@danihodovic danihodovic changed the base branch from devel to stable-2.7 October 17, 2018 20:31
@danihodovic
Copy link
Contributor Author

@jwitko I targeted the wrong base branch. My bad

@felixfontein
Copy link
Contributor

Haha, I see you already found out yourself how to do backports. I guess I should have read the other mails first before writing this :D

Copy link
Contributor

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

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

shipit

Can you also create a backport PR for 2.6?

@danihodovic
Copy link
Contributor Author

Haha, I see you already found out yourself how to do backports. I guess I should have read the other mails first before writing this :D

The Ansible docs were very straightforward when it came to this.
https://docs.ansible.com/ansible/2.5/community/development_process.html#backport-pull-request-process

I'm eager to patch this because I need it for my own work :)

Can you also create a backport PR for 2.6?

Sure thing 👍

@felixfontein
Copy link
Contributor

In any case, don't worry that this PR will be kept open for some time. Even if backport PRs are shipited, they won't be merged automatically, but will wait until the release manager for the release this backport is for merges them manually. This usually happens 1-3 days before release. 2.7.0 was released two weeks ago, so 2.7.1 will probably be released next week or the week after.

@danihodovic
Copy link
Contributor Author

In any case, don't worry that this PR will be kept open for some time. Even if backport PRs are shipited, they won't be merged automatically, but will wait until the release manager for the release this backport is for merges them manually. This usually happens 1-3 days before release. 2.7.0 was released two weeks ago, so 2.7.1 will probably be released next week or the week after.

Sounds good. Thank you for all the help in this process!

Do you think it's a good idea to submit backports for 2.5?

@ansibot ansibot added affects_2.7 This issue/PR affects Ansible v2.7 backport This PR does not target the devel branch. and removed affects_2.8 This issue/PR affects Ansible v2.8 needs_triage Needs a first human triage before being processed. labels Oct 17, 2018
@felixfontein
Copy link
Contributor

I don't think so; the release announcement of 2.5.10 said:

2.5.10 is the last scheduled release in the 2.5 series as it transitions to "critical security fixes only". Future 2.5 series releases will be made only if security issues are discovered that are deemed critical enough to be backported and released.

@abadger abadger merged commit 28ed7f7 into ansible:stable-2.7 Oct 22, 2018
@abadger
Copy link
Contributor

abadger commented Oct 22, 2018

merged for the 2.7.1 release

@danihodovic danihodovic deleted the backport/2.7/45508 branch October 22, 2018 16:14
@ansible ansible locked and limited conversation to collaborators Jul 22, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
affects_2.7 This issue/PR affects Ansible v2.7 backport This PR does not target the devel branch. bug This issue/PR relates to a bug. cloud community_review In order to be merged, this PR must follow the community review workflow. docker module This issue/PR relates to a module. support:community This issue/PR relates to code supported by the Ansible community.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants