[18.09] align dependencies with engine 18.09#2363
Merged
euanh merged 14 commits intomoby:bump_18.09from Jun 24, 2019
Merged
Conversation
Signed-off-by: John Howard <jhoward@microsoft.com> (cherry picked from commit 2f98d6b) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: John Howard <jhoward@microsoft.com> (cherry picked from commit f2cc435) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: John Howard <jhoward@microsoft.com> As well as bumping, libkv now requires go.etcd.io/bolt rather than boltdb/bolt. Hence removed bolt from vendor.conf, vendored go.etcd.io/bbot @ v1.3.1-etcd.8 and rerun vndr. (cherry picked from commit b1d8f8e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: John Howard <jhoward@microsoft.com> (cherry picked from commit 98c57a0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 87a61c1) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 3eb0763) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…c91eb966d Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
euanh
approved these changes
Jun 24, 2019
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Jul 23, 2019
full diff: moby/libnetwork@e7933d4...55685ba changes included: - moby/libnetwork#2382 Backporting PR 2069 to bump_18.09 - backport of https://github.com/docker/libnetwork#2069 Rolling back the port configs if failed to programIngress() - moby/libnetwork#2363 [18.09] align dependencies with engine 18.09 - moby/libnetwork#2400 [18.09 backport] Fix TestValidRemoteDriver GetCapabilities errors - moby/libnetwork#2391 [18.09 backport] Correctly clean up --config-only networks - backport of moby/libnetwork#2373 - fixes moby#35101 - moby/libnetwork#2392 [18.09 backport] remove gosimple - package is gone and it's not important Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
Jul 25, 2019
full diff: moby/libnetwork@e7933d4...55685ba changes included: - moby/libnetwork#2382 Backporting PR 2069 to bump_18.09 - backport of https://github.com/docker/libnetwork#2069 Rolling back the port configs if failed to programIngress() - moby/libnetwork#2363 [18.09] align dependencies with engine 18.09 - moby/libnetwork#2400 [18.09 backport] Fix TestValidRemoteDriver GetCapabilities errors - moby/libnetwork#2391 [18.09 backport] Correctly clean up --config-only networks - backport of moby/libnetwork#2373 - fixes moby/moby#35101 - moby/libnetwork#2392 [18.09 backport] remove gosimple - package is gone and it's not important Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 0a3767c7e9803f0a595a07b0548e99d60e861062 Component: engine
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This vendors the docker/engine 18.09 branch, and aligns the dependencies to match. This makes sure that this branch is testing against the same versions that it will be running with when vendored in the 18.09 engine
first four commits are a cherry-pick of #2268