Skip to content

Conversation

hannseman
Copy link
Contributor

This PR completes the work started in #2201 and #2261.

Fixes #2201
Fixes #2261
Fixes #2200

cc @bluikko

Barry Shapira added 3 commits March 22, 2019 10:38
…net size.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
Also corrected a documentation error: the default API version from
constants is currently 1.35, not 1.30 as was sometimes listed.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>

Removed accidental whitespace.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
The integration tests require restarting the swarm once for each
test.  I had done so manually with self.init_swarm(force_new_cluster=True)
but that wasn't resetting the swarm state correctly.  The usual
test teardown procedure cleans up correctly.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
@hannseman hannseman closed this Mar 22, 2019
@hannseman hannseman reopened this Mar 22, 2019
@hannseman
Copy link
Contributor Author

I’ll have a look at why the test test_attach_stream_and_cancel failed.

@GordonTheTurtle
Copy link

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "swarm-default-addr-pool-redux" git@github.com:hannseman/docker-py.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842359386800
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

@hannseman hannseman force-pushed the swarm-default-addr-pool-redux branch from 24c925e to cb17091 Compare March 22, 2019 15:55
@hannseman hannseman force-pushed the swarm-default-addr-pool-redux branch 7 times, most recently from ff29e00 to d6c6853 Compare March 22, 2019 19:29
Following docker#2201 (review)

Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
Co-authored-by: Hannes Ljungberg <hannes@5monkeys.se>
Co-authored-by: bluikko <14869000+bluikko@users.noreply.github.com>
@hannseman hannseman force-pushed the swarm-default-addr-pool-redux branch from d6c6853 to 68a271c Compare March 22, 2019 19:30
@hannseman
Copy link
Contributor Author

Had some trouble adding @bluikko as Co-Author of the commit. Hence all the force-pushes.

Copy link
Member

@chris-crone chris-crone left a comment

Choose a reason for hiding this comment

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

LGTM

@ijc ijc merged commit d38c724 into docker:master Mar 25, 2019
@ijc
Copy link
Contributor

ijc commented Mar 25, 2019

Thanks @bluikko and @hannseman!

@hannseman
Copy link
Contributor Author

@ijc @chris-crone thanks for the review and merge!

@bluikko
Copy link
Contributor

bluikko commented Mar 26, 2019

Thank you @ijc @hannseman for making it happen, my first attempt at githib was puny but I hope it at least brought some attention to this request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants