Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1228dbddb9 | ||
|
|
c00b00d623 | ||
|
|
7bbc9f1b82 | ||
|
|
15a92f9c92 | ||
|
|
9386c01845 |
No files matched your search
@@ -1,3 +1,16 @@
|
|||||||
|
## Release 1.4.4
|
||||||
|
|
||||||
|
Fixing a rather serious issue that slipped through our preparations
|
||||||
|
for Docker 1.10:
|
||||||
|
|
||||||
|
* Restarting Docker or rebooting your machine while the Weave Net
|
||||||
|
plugin is running causes Docker 1.10.0 to fail to start #1959/#1963
|
||||||
|
|
||||||
|
Also one other small fix:
|
||||||
|
|
||||||
|
* Avoid a hang when trying to use plugin and proxy at the same time
|
||||||
|
#1956/#1961
|
||||||
|
|
||||||
## Release 1.4.3
|
## Release 1.4.3
|
||||||
|
|
||||||
Preparing for Docker 1.10, plus some bug-fixes.
|
Preparing for Docker 1.10, plus some bug-fixes.
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ func EnsureInterfaceAndMcastRoute(ifaceName string) (*net.Interface, error) {
|
|||||||
}
|
}
|
||||||
dest := net.IPv4(224, 0, 0, 0)
|
dest := net.IPv4(224, 0, 0, 0)
|
||||||
check := func(route netlink.Route) bool {
|
check := func(route netlink.Route) bool {
|
||||||
return route.LinkIndex == iface.Index && route.Dst != nil && route.Dst.IP.Equal(dest)
|
return route.Dst != nil && route.Dst.IP.Equal(dest)
|
||||||
}
|
}
|
||||||
// check for currently-existing route after subscribing, to avoid race
|
// check for currently-existing route after subscribing, to avoid race
|
||||||
routes, err := netlink.RouteList(nil, netlink.FAMILY_V4)
|
routes, err := netlink.RouteList(nil, netlink.FAMILY_V4)
|
||||||
|
|||||||
@@ -106,9 +106,6 @@ func run(dockerClient *docker.Client, address, meshAddress, meshNetworkName, nam
|
|||||||
select {
|
select {
|
||||||
case sig := <-sigChan:
|
case sig := <-sigChan:
|
||||||
Log.Debugf("Caught signal %s; shutting down", sig)
|
Log.Debugf("Caught signal %s; shutting down", sig)
|
||||||
if meshNetworkName != "" {
|
|
||||||
return dockerClient.Client.RemoveNetwork(meshNetworkName)
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
case err := <-endChan:
|
case err := <-endChan:
|
||||||
return err
|
return err
|
||||||
|
|||||||
Reference in new issue
Block a user