From 276d0b621bd1a25d8a091b264f7f04d41ed81a58 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 5 Oct 2017 11:55:18 +0000 Subject: [PATCH 1/2] Add release v2.0.5 --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd6539fe..2a3977cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +## Release 2.0.5 + +Bug fixes + +* Fix /etc/hosts inside containers so the container's name resolves to + its Weave Net address #3136,#3138 +* New weave-kube config for Kubernetes 1.7 and 1.8 which resolves an + intermittent conflict with kube-proxy that could break Weave Net + until reboot #2998,#3134 +* Remove persistence file in `weave reset` when using Docker plugin V2 #3103,#3114 + +Build and test + +* Some trivial changes to placate go-lint #3137 + +[Full list of changes](https://github.com/weaveworks/weave/milestone/63?closed=1). + + ## Release 2.0.4 Bug fixes From be2da0773537f51101ca12ab08cb116fc7ac62a6 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 10 Oct 2017 09:46:35 -0500 Subject: [PATCH 2/2] fix note pins --- site/operational-guide/autoscaling.md | 2 +- site/operational-guide/tasks.md | 2 +- site/operational-guide/uniform-fixed-cluster.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site/operational-guide/autoscaling.md b/site/operational-guide/autoscaling.md index 79a0db40..7bb79d1b 100644 --- a/site/operational-guide/autoscaling.md +++ b/site/operational-guide/autoscaling.md @@ -39,7 +39,7 @@ You do not have to keep track of and specify the addresses of other dynamic peers in `$PEERS` - they will discover and connect to each other via the fixed cluster. ->>**Note:** The use of `--ipalloc-init=observer` prevents dynamic peers from +>**Note:** The use of `--ipalloc-init=observer` prevents dynamic peers from coming to a consensus on their own - this is important to stop a clique forming amongst a group of dynamically added peers if they become partitioned from the fixed cluster after having learned about diff --git a/site/operational-guide/tasks.md b/site/operational-guide/tasks.md index 3c703b97..d8375f0a 100644 --- a/site/operational-guide/tasks.md +++ b/site/operational-guide/tasks.md @@ -99,7 +99,7 @@ To minimize downtime while the new script is pulling the new container images: * Start the new Weave Net with `weave launch ` (or `systemctl start weave` if you're using a systemd unit file) ->>**Note:** Always check the Release Notes for specific versions in case +>**Note:** Always check the Release Notes for specific versions in case there are any special caveats or deviations from the standard procedure. diff --git a/site/operational-guide/uniform-fixed-cluster.md b/site/operational-guide/uniform-fixed-cluster.md index fa9c56d4..04a3d9ef 100644 --- a/site/operational-guide/uniform-fixed-cluster.md +++ b/site/operational-guide/uniform-fixed-cluster.md @@ -42,7 +42,7 @@ Then on _any_ peer run the following to force consensus: weave prime ->>**Note:** You can run this safely on more than one or +>**Note:** You can run this safely on more than one or even all peers, but it's only strictly necessary to run it on one of them.