From ae46d8c18608d4a541281e6211a00718bf948d75 Mon Sep 17 00:00:00 2001
From: Roberto Bruggemann <roberto@weave.works>
Date: Wed, 17 Jan 2018 11:06:34 +0000
Subject: [PATCH 1/2] Add release 1.7.0 to CHANGELOG

---
 CHANGELOG.md | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0279dfadc..c2013362b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,78 @@
+## Release 1.7.0
+
+Highlights:
+- Displaying pod logs now shows all container logs with each line prefixed by `[containerName]`.
+  Previously, the same view would fail if the pod had multiple containers.
+- Show all Kubernetes namespaces, including empty ones.
+- Various small improvements and performance work
+
+New features and enhancements:
+- Reading pod logs returns all container logs
+	[#3013](https://github.com/weaveworks/scope/pull/3013)
+- Probe reports namespaces
+	[#2985](https://github.com/weaveworks/scope/pull/2985)
+- show unconnected processes
+	[#3009](https://github.com/weaveworks/scope/pull/3009)
+
+Bug fixes and minor improvements:
+- Set a timeout to Terminal animation
+	[#3021](https://github.com/weaveworks/scope/pull/3021)
+- 'updateKubeFilters` returns early if there are no namespaces
+	[#3017](https://github.com/weaveworks/scope/pull/3017)
+- don't map image adjacencies to hosts
+	[#2997](https://github.com/weaveworks/scope/pull/2997)
+- cope with one->many topology mappings
+	[#2996](https://github.com/weaveworks/scope/pull/2996)
+- Tag images at build time
+	[#2987](https://github.com/weaveworks/scope/pull/2987)
+- don't exclude NATed connections in mapping to processes
+	[#2978](https://github.com/weaveworks/scope/pull/2978)
+
+Internal improvements and cleanup:
+- refactor: extract common code in endpoint mapping
+	[#3016](https://github.com/weaveworks/scope/pull/3016)
+- refactor: make PropagateSingleMetrics a renderer
+	[#3008](https://github.com/weaveworks/scope/pull/3008)
+- refactor: move RenderContext where it belongs
+	[#3005](https://github.com/weaveworks/scope/pull/3005)
+- render sensible labels for nodes with little/no metadata
+	[#2998](https://github.com/weaveworks/scope/pull/2998)
+- refactor: banish TheInternet
+	[#3003](https://github.com/weaveworks/scope/pull/3003)
+- benchmark report summarization
+	[#3000](https://github.com/weaveworks/scope/pull/3000)
+- refactor: inline summarisation of metadata, metrics, tables
+	[#2999](https://github.com/weaveworks/scope/pull/2999)
+- Upgrade Go to 1.9.2
+	[#2993](https://github.com/weaveworks/scope/pull/2993)
+- simplify `joinResults`
+	[#2994](https://github.com/weaveworks/scope/pull/2994)
+- Suggest how to disable weave errors and warnings
+	[#2990](https://github.com/weaveworks/scope/pull/2990)
+- refactor: drop networks from render.MapFunc
+	[#2991](https://github.com/weaveworks/scope/pull/2991)
+
+Performance improvements:
+- remove Node.Edges
+	[#2992](https://github.com/weaveworks/scope/pull/2992)
+- remove unnecessary metadata propagation
+	[#3007](https://github.com/weaveworks/scope/pull/3007)
+- permit setting `probe.kubernetes.interval` to 0
+	[#3012](https://github.com/weaveworks/scope/pull/3012)
+- Stop fetching ReplicaSets and ReplicationControllers
+	[#3014](https://github.com/weaveworks/scope/pull/3014)
+- optimisation: pre-allocate, and fewer slices during summarisation
+	[#3002](https://github.com/weaveworks/scope/pull/3002)
+- make `Report.Topology(name)` fast
+	[#3001](https://github.com/weaveworks/scope/pull/3001)
+
+Weave Cloud related changes:
+- Bump ui-components to v0.4.18
+	[#3019](https://github.com/weaveworks/scope/pull/3019)
+- Simplifying backgrounds to match lightgray in service-ui and ui-compo…
+	[#3011](https://github.com/weaveworks/scope/pull/3011)
+
+
 ## Release 1.6.7
 
 This is a minor patch release.

From 889fbea83eb1d122a20831291e16bd6670b9fb86 Mon Sep 17 00:00:00 2001
From: Roberto Bruggemann <roberto@weave.works>
Date: Wed, 17 Jan 2018 11:07:50 +0000
Subject: [PATCH 2/2] Update Scope version in docs to 1.7.0

---
 site/installing.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/installing.md b/site/installing.md
index 744af40b8..5b50d8980 100644
--- a/site/installing.md
+++ b/site/installing.md
@@ -125,7 +125,7 @@ After it’s been launched, open your browser to `http://localhost:4040`.
 **Docker Compose Format Version 1:**
 
     scope:
-      image: weaveworks/scope:1.6.7
+      image: weaveworks/scope:1.7.0
       net: "host"
       pid: "host"
       privileged: true
@@ -141,7 +141,7 @@ After it’s been launched, open your browser to `http://localhost:4040`.
     version: '2'
     services:
       scope:
-        image: weaveworks/scope:1.6.7
+        image: weaveworks/scope:1.7.0
         network_mode: "host"
         pid: "host"
         privileged: true
@@ -165,7 +165,7 @@ Version 2 of this YAML file supports networks and volumes as defined by any plug
 **Docker Compose Format Version 1:**
 
     probe:
-      image: weaveworks/scope:1.6.7
+      image: weaveworks/scope:1.7.0
       net: "host"
       pid: "host"
       privileged: true
@@ -182,7 +182,7 @@ Version 2 of this YAML file supports networks and volumes as defined by any plug
     version: '2'
     services:
       probe:
-        image: weaveworks/scope:1.6.7
+        image: weaveworks/scope:1.7.0
         network_mode: "host"
         pid: "host"
         privileged: true