Add release v1.1.2

silly mistake

CHANGELOG.md

@@ -1,3 +1,13 @@
+## Release 1.1.2
+
+This release contains a small number of bug fixes. More details in the
+[change log](https://github.com/weaveworks/weave/issues?q=milestone%3A1.1.2).
+
+The release is fully compatible with 1.1.0 versions, so existing
+clusters can be upgraded incrementally. When upgrading from 1.0.x,
+note the compatibility information in the
+[Installation & Upgrading instructions for Weave 1.1.0](https://github.com/weaveworks/weave/releases/tag/v1.1.0).
+
 ## Release 1.1.1
 
 This release contains a number of bug fixes and minor

Makefile

@@ -81,8 +81,8 @@ $(COVER_EXE): testing/cover/cover.go
 $(RUNNER_EXE): testing/runner/runner.go
 
 $(WEAVEWAIT_EXE) $(SIGPROXY_EXE) $(WEAVEHOSTS_EXE) $(COVER_EXE) $(RUNNER_EXE):
-	go get ./$(@D)
-	go build -o $@ ./$(@D)
+	go get -tags netgo ./$(@D)
+	go build $(BUILD_FLAGS) -o $@ ./$(@D)
 
 $(WEAVER_UPTODATE): prog/weaver/Dockerfile $(WEAVER_EXE)
 	$(SUDO) docker build -t $(WEAVER_IMAGE) prog/weaver

proxy/inspect_container_interceptor.go

@@ -13,7 +13,7 @@ func (i *inspectContainerInterceptor) InterceptRequest(r *http.Request) error {
 }
 
 func (i *inspectContainerInterceptor) InterceptResponse(r *http.Response) error {
-	if !i.proxy.RewriteInspect {
+	if !i.proxy.RewriteInspect || r.StatusCode != 200 {
 		return nil
 	}
 

router/ethernet_decoder.go

@@ -60,7 +60,7 @@ func (dec *EthernetDecoder) sendICMPFragNeeded(mtu int, sendFrame func([]byte) e
 		return err
 	}
 
-	log.Printf("Sending ICMP 3,4 (%v -> %v): PMTU= %v", dec.IP.DstIP, dec.IP.SrcIP, mtu)
+	log.Printf("Sending ICMP 3,4 (%v -> %v): PMTU=%v", dec.IP.DstIP, dec.IP.SrcIP, mtu)
 	return sendFrame(buf.Bytes())
 }
 

router/local_peer.go

@@ -69,7 +69,7 @@ func (peer *LocalPeer) RelayBroadcast(srcPeer *Peer, frame []byte, dec *Ethernet
 			dec)
 		if err != nil {
 			if ftbe, ok := err.(FrameTooBigError); ok {
-				log.Warningf("dropping too big DF broadcast frame (%v -> %v): PMTU= %v", dec.IP.DstIP, dec.IP.SrcIP, ftbe.EPMTU)
+				log.Warningf("dropping too big DF broadcast frame (%v -> %v): PMTU=%v", dec.IP.SrcIP, dec.IP.DstIP, ftbe.EPMTU)
 			} else {
 				log.Errorln(err)
 			}

site/systemd.md

@@ -23,8 +23,7 @@ normally place it in `/etc/systemd/system/weave.service`.
     [Service]
     EnvironmentFile=-/etc/sysconfig/weave
     ExecStartPre=/usr/local/bin/weave launch $PEERS
-    ExecStart=/usr/bin/docker logs -f weave
-    SuccessExitStatus=2
+    ExecStart=/usr/bin/docker attach weave
     ExecStop=/usr/local/bin/weave stop
     [Install]
     WantedBy=multi-user.target

test/105_frag_2_test.sh

@@ -25,7 +25,7 @@ sleep 35 # give weave time to discover the PMTU
 # Check large packets get through. The first attempt typically fails,
 # since the sending container hasn't discovered the PMTU yet. The 2nd
 # attempt should succeed.
-exec_on $HOST2 c2 $PING -s 10000 $C1 2>&1 1>/dev/null || true
+exec_on $HOST2 c2 $PING -s 10000 $C1 1>/dev/null 2>&1 || true
 assert_raises "exec_on $HOST2 c2 $PING -s 10000 $C1"
 
 run_on $HOST2 "sudo iptables -D $drop_large_udp_packets"

test/600_proxy_docker_py.sh

@@ -29,9 +29,11 @@ docker_py_test() {
 
     weave_on $HOST1 launch-proxy --no-default-ipalloc
 
+    DOCKER_BRIDGE_IP=$(weave_on $HOST1 docker-bridge-ip)
+
     if docker_on $HOST1 run \
         -e NOT_ON_HOST=true \
-        -e DOCKER_HOST=tcp://172.17.42.1:12375 \
+        -e DOCKER_HOST=tcp://$DOCKER_BRIDGE_IP:12375 \
         -v /tmp:/tmp \
         -v /var/run/docker.sock:/var/run/docker.sock \
         joffrey/docker-py py.test $TESTS ; then

test/setup.sh

@@ -6,7 +6,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 
 . ./config.sh
 
-(cd ./tls && go get ./... && go run generate_certs.go $HOSTS)
+(cd ./tls && go get -tags netgo ./... && go run generate_certs.go $HOSTS)
 
 echo "Copying weave images, scripts, and certificates to hosts, and"
 echo "  prefetch test images"

weave

@@ -543,8 +543,14 @@ attach() {
 
     # Route multicast packets across the weave network.
     # This must come last in 'attach'. If you change this, change weavewait to match.
+    #
+    # The MTU lock prevents PMTU discovery for multicast
+    # destinations. Without that, the kernel sets the DF flag on
+    # multicast packets. Since RFC1122 prohibits sending of ICMP
+    # errors for packets with multicast destinations, that causes
+    # packets larger than the PMTU to be dropped silently.
     if ! netnsenter ip route show | grep '^224\.0\.0\.0/4' >/dev/null ; then
-        netnsenter ip route add 224.0.0.0/4 dev $CONTAINER_IFNAME
+        netnsenter ip route add 224.0.0.0/4 dev $CONTAINER_IFNAME mtu lock $MTU
     fi
 }