From 42255748cd006ee955246ad724c787aaf931e7d4 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Thu, 29 Oct 2015 16:03:14 -0700
Subject: [PATCH] Update ROADMAP.md

---
 ROADMAP.md | 55 ++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 16 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 560e47063..39f795769 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -8,28 +8,51 @@ The dates below should not be considered authoritative, but rather indicative of
 
 etcd 2.2 is our current stable branch. The roadmap below outlines new features that will be added to etcd, and while subject to change, define what future stable will look like.
 
-### etcd 2.3 (October)
-- improved v3 API
-	- support clustered API
-	- support watch API
-	- use gRPC error code
-	- initial performance benchmark for get/put/delete
+### etcd 2.3alpha (November)
+- v3 API preview
+ 	- support clustered API
+        - use gRPC error code
 	- initial API level testing
+        - transactions
+- basic runtime metrics
 - better backend 
-	- fully tested backend
-	- benchmark performance for key operations
 	- benchmark memory usage
 - experimental v3 compatibility
 	- store v2 snapshot into new backend
 	- move snapshot logic out of raft to support new snapshot work-flow
-- simple v3 client (maybe)
+
+### etcd 2.3 (November)
+- improved v3 API preview
+	- initial performance benchmark for get/put/delete
+	- support watch API
+- improved runtime metrics
+        - raft state machine
+        - new backend
+        - V3 API
+- better backend 
+	- fully tested backend
+	- benchmark performance for key operations
 
 ### etcd 3.0 (January)
 - v3 API ([see also the issue tag](https://github.com/coreos/etcd/issues?utf8=%E2%9C%93&q=label%3Aarea/v3api))
-  - Transactions
-  - Leases
-  - Binary protocol
-  - Support a large number of watchers
--  Better disk backend
-  - Improved write throughput
-  - Support larger datasets and histories
+    - Leases
+    - Binary protocol
+    - Support a large number of watchers
+    - Failure guarantees documented
+-  Simple v3 client (golang)
+
+#### etcd 3.1 (February)
+- v3 API
+    - Locking
+- Better disk backend
+    - Improved write throughput
+    - Support larger datasets and histories
+- Simpler disaster recovery UX
+- Integrated with Kubernetes
+
+#### etcd 3.2 (March)
+- API bindings for other languages
+
+#### etcd 3.+ (future)
+- Mirroring
+- Horizontally scalable proxy layer