From 7cf5712c8941b677afbf434b909b7e2da1da0072 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bryan@weave.works>
Date: Wed, 29 May 2019 09:05:08 +0000
Subject: [PATCH] docs: Release 1.11.1

Signed-off-by: Bryan Boreham <bryan@weave.works>
---
 CHANGELOG.md                                | 10 ++++++++++
 examples/cri/deploy.yaml                    |  2 +-
 examples/cri/ds.yaml                        |  2 +-
 examples/docker/docker-compose-probe-v1.yml |  2 +-
 examples/docker/docker-compose-probe-v2.yml |  2 +-
 examples/k8s/deploy.yaml                    |  2 +-
 examples/k8s/ds.yaml                        |  2 +-
 examples/k8s/probe-deploy.yaml              |  2 +-
 examples/mesos/minimesos.json               |  2 +-
 site/installing.md                          |  4 ++--
 10 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31e46775ad..bb954c7173 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## Release 1.11.1
+
+This release fixes a couple of bugs:
+
+- Sometimes probe would fail to remove its record of a container when it is destroyed
+	[#3623](https://github.com/weaveworks/scope/pull/3623)
+- Contrast mode was not being reflected in the URL
+	[#3617](https://github.com/weaveworks/scope/pull/3617)
+
+
 ## Release 1.11.0
 
 ### Highlights
diff --git a/examples/cri/deploy.yaml b/examples/cri/deploy.yaml
index 1039bd04ca..7079fe6ee7 100644
--- a/examples/cri/deploy.yaml
+++ b/examples/cri/deploy.yaml
@@ -25,7 +25,7 @@ spec:
           args:
             - '--no-probe'
           env: []
-          image: weaveworks/scope:1.11.0
+          image: weaveworks/scope:1.11.1
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 4040
diff --git a/examples/cri/ds.yaml b/examples/cri/ds.yaml
index 830c2c609e..7aa1ad49ac 100644
--- a/examples/cri/ds.yaml
+++ b/examples/cri/ds.yaml
@@ -34,7 +34,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: weaveworks/scope:1.11.0
+          image: weaveworks/scope:1.11.1
           imagePullPolicy: IfNotPresent
           securityContext:
             privileged: true
diff --git a/examples/docker/docker-compose-probe-v1.yml b/examples/docker/docker-compose-probe-v1.yml
index 415f9c6920..ceaffab838 100644
--- a/examples/docker/docker-compose-probe-v1.yml
+++ b/examples/docker/docker-compose-probe-v1.yml
@@ -1,5 +1,5 @@
 probe:
-  image: weaveworks/scope:1.11.0
+  image: weaveworks/scope:1.11.1
   net: "host"
   pid: "host"
   privileged: true
diff --git a/examples/docker/docker-compose-probe-v2.yml b/examples/docker/docker-compose-probe-v2.yml
index 7fc7775465..deee1fa0bb 100644
--- a/examples/docker/docker-compose-probe-v2.yml
+++ b/examples/docker/docker-compose-probe-v2.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   probe:
-    image: weaveworks/scope:1.11.0
+    image: weaveworks/scope:1.11.1
     network_mode: "host"
     pid: "host"
     privileged: true
diff --git a/examples/k8s/deploy.yaml b/examples/k8s/deploy.yaml
index fc2bc48d7b..06c9155b42 100644
--- a/examples/k8s/deploy.yaml
+++ b/examples/k8s/deploy.yaml
@@ -28,7 +28,7 @@ spec:
           args:
             - '--no-probe'
           env: []
-          image: weaveworks/scope:1.11.0
+          image: weaveworks/scope:1.11.1
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 4040
diff --git a/examples/k8s/ds.yaml b/examples/k8s/ds.yaml
index 22d167469a..42b7048716 100644
--- a/examples/k8s/ds.yaml
+++ b/examples/k8s/ds.yaml
@@ -31,7 +31,7 @@ spec:
             - '--probe.docker.bridge=docker0'
             - '--probe.docker=true'
             - 'weave-scope-app.weave.svc.cluster.local.:80'
-          image: weaveworks/scope:1.11.0
+          image: weaveworks/scope:1.11.1
           imagePullPolicy: IfNotPresent
           resources:
             requests:
diff --git a/examples/k8s/probe-deploy.yaml b/examples/k8s/probe-deploy.yaml
index 4b3b47da65..fedc8d58e8 100644
--- a/examples/k8s/probe-deploy.yaml
+++ b/examples/k8s/probe-deploy.yaml
@@ -35,7 +35,7 @@ spec:
             - 'weave-scope-app.weave.svc.cluster.local.:80'
           command:
             - /home/weave/scope
-          image: 'docker.io/weaveworks/scope:1.11.0'
+          image: 'docker.io/weaveworks/scope:1.11.1'
           imagePullPolicy: IfNotPresent
           resources:
             requests:
diff --git a/examples/mesos/minimesos.json b/examples/mesos/minimesos.json
index 3f74f480af..b661027aaa 100644
--- a/examples/mesos/minimesos.json
+++ b/examples/mesos/minimesos.json
@@ -12,7 +12,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "weaveworks/scope:1.11.0",
+      "image": "weaveworks/scope:1.11.1",
       "network": "HOST",
       "privileged": true,
       "parameters": [
diff --git a/site/installing.md b/site/installing.md
index 8c189a1545..58de1f829f 100644
--- a/site/installing.md
+++ b/site/installing.md
@@ -112,7 +112,7 @@ After it’s been launched, open your browser to `http://localhost:4040`.
 **Docker Compose Format Version 1:**
 
     scope:
-      image: weaveworks/scope:1.11.0
+      image: weaveworks/scope:1.11.1
       net: "host"
       pid: "host"
       privileged: true
@@ -128,7 +128,7 @@ After it’s been launched, open your browser to `http://localhost:4040`.
     version: '2'
     services:
       scope:
-        image: weaveworks/scope:1.11.0
+        image: weaveworks/scope:1.11.1
         network_mode: "host"
         pid: "host"
         privileged: true