Merge pull request #198 from andrewhsu/ga

[17.06] bump version to 17.06.1-ce
Merge pull request #199 from andrewhsu/cl
2026-08-28 02:24:15 -05:00 · 2017-08-17 14:18:05 -07:00 · 2017-08-17 14:17:47 -07:00 · 2017-08-17 11:31:01 -07:00 · 2017-08-17 10:56:19 -07:00 · 2017-08-17 10:46:27 -07:00
7 changed files with 12 additions and 6 deletions
@@ -5,7 +5,7 @@ information on the list of deprecated flags and APIs please have a look at
 https://docs.docker.com/engine/deprecated/ where target removal dates can also
 be found.

-## 17.06.1-ce (2017-07-XX)
+## 17.06.1-ce (2017-08-17)

 ### Builder

@@ -31,6 +31,7 @@ be found.
 ### Networking

 * Fixed issue with driver options not received by network drivers [#127](https://github.com/docker/docker-ce/pull/127)
+* Fixed issue with overlay network IP address reuse [#197](https://github.com/docker/docker-ce/pull/197)

 ### Plugins

@@ -1 +1 @@
-17.06.1-ce-rc4
+17.06.1-ce
@@ -1 +1 @@
-17.06.1-ce-rc4
+17.06.1-ce
@@ -1 +1 @@
-17.06.1-ce-rc4
+17.06.1-ce
@@ -27,7 +27,7 @@ github.com/imdario/mergo 0.2.1
 golang.org/x/sync de49d9dcd27d4f764488181bea099dfe6179bcf0

 #get libnetwork packages
-github.com/docker/libnetwork 21026683470a66bf752e3d61e660ab07813cdc61
+github.com/docker/libnetwork 93976265048377e7644acfbfae2178a17fb04087
 github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894
 github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
 github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -81,6 +82,10 @@ func setDefaultVlan() {
 		logrus.Error("insufficient number of arguments")
 		os.Exit(1)
 	}
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
 	nsPath := os.Args[1]
 	ns, err := netns.GetFromPath(nsPath)
 	if err != nil {
@@ -254,7 +254,7 @@ func (d *driver) peerOpRoutine(ctx context.Context, ch chan *peerOperation) {
 			case peerOperationADD:
 				err = d.peerAddOp(op.networkID, op.endpointID, op.peerIP, op.peerIPMask, op.peerMac, op.vtepIP, op.updateDB, op.l2Miss, op.l3Miss, op.localPeer)
 			case peerOperationDELETE:
-				err = d.peerDeleteOp(op.networkID, op.endpointID, op.peerIP, op.peerIPMask, op.peerMac, op.vtepIP, op.localPeer)
+				err = d.peerDeleteOp(op.networkID, op.endpointID, op.peerIP, op.peerIPMask, op.peerMac, op.vtepIP, op.updateDB)
 			}
 			if err != nil {
 				logrus.Warnf("Peer operation failed:%s op:%v", err, op)
Author	SHA1	Message	Date
Andrew HsuandGitHub	874a7374f3	Merge pull request #198 from andrewhsu/ga [17.06] bump version to 17.06.1-ce	2017-08-17 14:18:05 -07:00
Andrew HsuandGitHub	d7fe3fc7eb	Merge pull request #199 from andrewhsu/cl [17.06] update changelog for docker-ce 17.06.1	2017-08-17 14:17:47 -07:00
Andrew Hsu	6b2e31a753	update changelog for docker-ce 17.06.1 Signed-off-by: Andrew Hsu <andrewhsu@docker.com>	2017-08-17 11:31:01 -07:00
Andrew Hsu	29d9279ad4	bump version to 17.06.1-ce Signed-off-by: Andrew Hsu <andrewhsu@docker.com>	2017-08-17 10:56:19 -07:00
Andrew HsuandGitHub	99a27323fe	Merge pull request #197 from andrewhsu/ven-ln [17.06] vndr libnetwork to bring in fix for overlay network ip reuse	2017-08-17 10:46:27 -07:00
Andrew Hsu	4770c7af51	vndr libnetwork to bring in fix for overlay network ip reuse Signed-off-by: Andrew Hsu <andrewhsu@docker.com>	2017-08-16 21:22:27 -07:00