Skip to content

Commit

Permalink
Merge pull request #1963 from /issues/1959-dont-remove-network
Browse files Browse the repository at this point in the history
Don't remove weave network on plugin shutdown because it bricks Docker 1.10
  • Loading branch information
awh committed Feb 9, 2016
2 parents 15a92f9 + 7bbc9f1 commit c00b00d
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions prog/plugin/main.go
Expand Up @@ -106,9 +106,6 @@ func run(dockerClient *docker.Client, address, meshAddress, meshNetworkName, nam
select {
case sig := <-sigChan:
Log.Debugf("Caught signal %s; shutting down", sig)
if meshNetworkName != "" {
return dockerClient.Client.RemoveNetwork(meshNetworkName)
}
return nil
case err := <-endChan:
return err
Expand Down

0 comments on commit c00b00d

Please sign in to comment.