Merge pull request #1971 from vieux/rescheduling_out

move rescheduling out of experimental

cli/manage.go

@@ -18,7 +18,6 @@ import (
 	"github.com/docker/swarm/cluster"
 	"github.com/docker/swarm/cluster/mesos"
 	"github.com/docker/swarm/cluster/swarm"
-	"github.com/docker/swarm/experimental"
 	"github.com/docker/swarm/scheduler"
 	"github.com/docker/swarm/scheduler/filter"
 	"github.com/docker/swarm/scheduler/strategy"
@@ -325,9 +324,6 @@ func manage(c *cli.Context) {
 		server.SetHandler(api.NewPrimary(cl, tlsConfig, &statusHandler{cl, nil, nil}, c.GlobalBool("debug"), c.Bool("cors")))
 	}
 
-	if experimental.ENABLED {
-		log.Warn("WARNING: rescheduling is currently experimental, use at your own risks")
-		cluster.NewWatchdog(cl)
-	}
+	cluster.NewWatchdog(cl)
 	log.Fatal(server.ListenAndServe())
 }

experimental/README.md

@@ -20,7 +20,7 @@ $ swarm -experimental join ...
 
 ## Current experimental features
 
- * [Container Rescheduling on node failure](rescheduling.md)
+ * *none*
 
 ## How to comment on an experimental feature