Skip to content

Revert "Add sandbox API for task insertion to service LB and service discovery"#1445

Merged
mrjana merged 1 commit intomoby:masterfrom
sanimej:revertlb
Sep 14, 2016
Merged

Revert "Add sandbox API for task insertion to service LB and service discovery"#1445
mrjana merged 1 commit intomoby:masterfrom
sanimej:revertlb

Conversation

@sanimej
Copy link
Copy Markdown

@sanimej sanimej commented Sep 14, 2016

This reverts commit 2fb2fd2.

This change was to support container health aware LB and graceful rolling upgrade. Without the docker and swarmkit changes for these features libnetwork can't be vendored in. Hence reverting it now and will be included when the docker/swarmkit changes are complete. cc @dongluochen

…discovery"

This reverts commit 2fb2fd2.

Signed-off-by: Santhosh Manohar <santhosh@docker.com>
@GordonTheTurtle
Copy link
Copy Markdown

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

$ git clone -b "revertlb" git@github.com:sanimej/libnetwork.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -f

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

@aboch
Copy link
Copy Markdown
Contributor

aboch commented Sep 14, 2016

LGTM

1 similar comment
@mrjana
Copy link
Copy Markdown
Contributor

mrjana commented Sep 14, 2016

LGTM

@mrjana mrjana merged commit 74eef7e into moby:master Sep 14, 2016
@liweinan0423
Copy link
Copy Markdown

@sanimej Could you give more details why this commit is reverted? What changes in docker and swarmkit have to be done before we could get this commit back?

@sanimej
Copy link
Copy Markdown
Author

sanimej commented Sep 28, 2016

@liweinan0423 This change introduces libnetwork APIs to enable/disable the service associated with the task. The changes needed (being worked on) on the docker side is to invoke the new APIs during task creation & deletion.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants