From ab19dee5cef9fdc203fcbd93d0cf3c588338b8cc Mon Sep 17 00:00:00 2001
From: Gyuho Lee <gyuhox@gmail.com>
Date: Tue, 5 Jun 2018 16:08:51 -0700
Subject: [PATCH] CHANGELOG: highlight June patch release

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
---
 CHANGELOG-3.1.md | 16 ++++++++++++++++
 CHANGELOG-3.3.md |  4 ++++
 CHANGELOG-3.4.md |  1 +
 3 files changed, 21 insertions(+)

diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md
index baca25300..93a3cd021 100644
--- a/CHANGELOG-3.1.md
+++ b/CHANGELOG-3.1.md
@@ -3,6 +3,22 @@
 Previous change logs can be found at [CHANGELOG-3.0](https://github.com/coreos/etcd/blob/master/CHANGELOG-3.0.md).
 
 
+## [v3.1.17](https://github.com/coreos/etcd/releases/tag/v3.1.17) (TBD 2018-06)
+
+See [code changes](https://github.com/coreos/etcd/compare/v3.1.16...v3.1.17) and [v3.1 upgrade guide](https://github.com/coreos/etcd/blob/master/Documentation/upgrades/upgrade_3_1.md) for any breaking changes. **Again, before running upgrades from any previous release, please make sure to read change logs below and [v3.1 upgrade guide](https://github.com/coreos/etcd/blob/master/Documentation/upgrades/upgrade_3_1.md).**
+
+### etcd server
+
+- Fix [v3 snapshot recovery](https://github.com/coreos/etcd/issues/7628).
+  - A follower receives a leader snapshot and persists to `[SNAPSHOT-INDEX].snap.db` file on disk.
+  - Server now [ensures that incoming snapshot be persisted on disk](https://github.com/coreos/etcd/pull/7876) before loading it.
+  - Otherwise, index mismatch could happen, triggering server-side panic (e.g. newer WAL entry with outdated snapshot index).
+
+### Go
+
+- Compile with [*Go 1.8.7*](https://golang.org/doc/devel/release.html#go1.8).
+
+
 ## [v3.1.16](https://github.com/coreos/etcd/releases/tag/v3.1.16) (2018-05-31)
 
 See [code changes](https://github.com/coreos/etcd/compare/v3.1.15...v3.1.16) and [v3.1 upgrade guide](https://github.com/coreos/etcd/blob/master/Documentation/upgrades/upgrade_3_1.md) for any breaking changes. **Again, before running upgrades from any previous release, please make sure to read change logs below and [v3.1 upgrade guide](https://github.com/coreos/etcd/blob/master/Documentation/upgrades/upgrade_3_1.md).**
diff --git a/CHANGELOG-3.3.md b/CHANGELOG-3.3.md
index 4618863bd..41275be89 100644
--- a/CHANGELOG-3.3.md
+++ b/CHANGELOG-3.3.md
@@ -15,6 +15,10 @@ See [code changes](https://github.com/coreos/etcd/compare/v3.3.6...v3.3.7) and [
   - Add [`etcd --cipher-suites`](https://github.com/coreos/etcd/pull/9801) flag.
   - If empty, Go auto-populates the list.
 
+### etcdctl v3
+
+- Fix [`move-leader` command for TLS-enabled endpoints](https://github.com/coreos/etcd/pull/9807).
+
 ### Go
 
 - Compile with [*Go 1.9.6*](https://golang.org/doc/devel/release.html#go1.9).
diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md
index 45a9b7e81..fd7b31e2a 100644
--- a/CHANGELOG-3.4.md
+++ b/CHANGELOG-3.4.md
@@ -331,6 +331,7 @@ Note: **v3.5 will deprecate `etcd --log-package-levels` flag for `capnslog`**; `
   - Previously, [`endpoint health --write-out json` did not work](https://github.com/coreos/etcd/issues/9532).
 - Fix [`watch [key] [range_end] -- [exec-command…]`](https://github.com/coreos/etcd/pull/9688) parsing.
   - Previously,  `ETCDCTL_API=3 ./bin/etcdctl watch foo -- echo watch event received` panicked.
+- Fix [`move-leader` command for TLS-enabled endpoints](https://github.com/coreos/etcd/pull/9807).
 
 ### gRPC proxy