Stop passing etcd_servers to controller manager
Merge pull request #804 from lavalamp/fixEtcd

Stop passing etcd_servers to controller manager