Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[18.09 backport] Ignore default address-pools on API < 1.39 #118

Merged
merged 1 commit into from
Nov 27, 2018
Merged

[18.09 backport] Ignore default address-pools on API < 1.39 #118

merged 1 commit into from
Nov 27, 2018

Conversation

thaJeztah
Copy link
Member

These options were added in API 1.39, so should be ignored when using an older version of the API.

relates to moby#37558

backport of moby#38196 for 18.09

git checkout -b 18.09_backport_fence_default_addr_pools ce-engine/18.09
git cherry-pick -s -S -x 7632ccbc66c82179547b96524672bd5082ae7481
git push -u origin

cherry-pick was clean; no conflicts

@thaJeztah thaJeztah added this to the 18.09.1 milestone Nov 20, 2018
@thaJeztah
Ignore default address-pools on API < 1.39
4cc45d9 
These options were added in API 1.39, so should be ignored
when using an older version of the API.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7632ccb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 18.09_backport_fence_default_addr_pools branch from b4f1ece to 4cc45d9 Compare November 21, 2018 21:15
@thaJeztah
Copy link
Member Author

pushed again to trigger CI

andrewhsu
andrewhsu approved these changes Nov 27, 2018
View reviewed changes
Copy link

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit 23122e4 into docker-archive:18.09 Nov 27, 2018
@thaJeztah thaJeztah deleted the 18.09_backport_fence_default_addr_pools branch November 27, 2018 18:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@andrewhsu andrewhsu andrewhsu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
18.09.1
2 participants
@thaJeztah @andrewhsu