Skip to content

Backporting PR #2069 to bump_18.09#2382

Merged
euanh merged 1 commit intomoby:bump_18.09from
dani-docker:bump_18.09_1550
Jun 24, 2019
Merged

Backporting PR #2069 to bump_18.09#2382
euanh merged 1 commit intomoby:bump_18.09from
dani-docker:bump_18.09_1550

Conversation

@dani-docker
Copy link
Contributor

Signed-off-by: fanjiyun [email protected]

This is a backport of PR #2069
git cherry-pick db50782 Merged cleanly
CC: @arkodg @joeabbey

@dani-docker dani-docker changed the title Rolling back the port configs if failed to programIngress() Backporting PR #2069 to bump_18.09 May 22, 2019
@thaJeztah
Copy link
Member

can you use the -x option for your cherry-pick (so that there's a reference to the original commit)?

Copy link
Contributor

@arkodg arkodg left a comment

Choose a reason for hiding this comment

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

LGTM

@arkodg
Copy link
Contributor

arkodg commented Jun 21, 2019

PTAL @euanh

@euanh euanh merged commit 36ff5f8 into moby:bump_18.09 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 <[email protected]>
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 <[email protected]>
Upstream-commit: 0a3767c7e9803f0a595a07b0548e99d60e861062
Component: engine
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