Merge v1.0.1

Signed-off-by: Emile Vauge <emile@vauge.com>
2016-07-28 19:32:12 +02:00
parent a016741918 a8d05294bc
commit e62cca1e7c
13 changed files with 97 additions and 46 deletions
--- a/traefik.sample.toml
+++ b/traefik.sample.toml
@@ -505,7 +505,7 @@
 #
 # Required
 #
-# endpoint = "127.0.0.1:4001"
+# endpoint = "127.0.0.1:2379"

 # Enable watch Etcd changes
 #