From 70e033c07c4ab8f8c75001dda777decd33155f40 Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Mon, 23 Feb 2015 10:57:24 -0800
Subject: [PATCH] update roadmap.md

Signed-off-by: Victor Vieux <vieux@docker.com>
---
 ROADMAP.md | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index b691e50bab..5dd55acf30 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,29 +1,38 @@
 Docker Swarm Roadmap
 =====================
 
-####Security
-* [x] TLS authentication
-
 ####Scheduler
-* [ ] Persistent state storage
+Swarm comes with a builtin scheduler. It currently provides basic functionalities, such as
+scheduling containers based on constraints or affinity (co-scheduling of containers), persistent
+storage and multiple scheduling strategies like binpacking or random.
+
+We plan to add more features to the builtin scheduler such as rebalancing (in case of host failure)
+and global scheduling (schedule containers on every node)
+
 * [ ] Virtual Container ID
 * [ ] Rebalancing
-* [x] Affinity constraints & improved constraints expression (==, !=, regular expressions)
-* [ ] Global scheduling (schedule containers on every node)
+* [ ] Global scheduling
+
+####Leader Election (Distributed State)
+Regarding Swarm Multi-tenancy, we are working on shared states between multiple "soon-to-be-master"
+and master election.
 
-####Multi-tenancy
-* [ ] Master election
 * [ ] Shared state
+* [ ] Master election
 
 ####API Matching
+Swarm currently supports around 75% of the Docker API as you can see [here](https://github.com/docker/swarm/blob/master/api/README.md)
+
+Our goal is to support 100% of the API, so all the Docker CLI commands would work against Swarm 
+
 * [ ] Bring Swarm API on par with Docker API as much as possible
-* [x] Support for `docker attach` (interactive sessions)
 
 ####Extensibility
-* [ ] Pluggable scheduler
-* [ ] Discovery backends
-  * [x]    etcd
-  * [x]    zookeeper
-  * [x]    consul
-  * [x]    hub 
-  * [x]    file
+The builtin scheduler allows you to manage container on approximately hundreds of machines within a cluster.
+In the future, we want to allow third party tools to be plugged into Docker Swarm to allow management
+of much bigger clusters.
+
+The work has started on defining the "cluster" interface in [#393](https://github.com/docker/swarm/issues/393)
+qThe first integration will be Mesos but other tools will arrive after, like kubernetes.
+
+* [ ] Cluster Drivers