3 Commits

Author	SHA1	Message	Date
Tonis Tiigi	1c57d98347	Add cert-expiry to swarm update ... Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Upstream-commit: 7d8d51aa9d0c1737ff7f97a3efac0a2ef0975b56 Component: engine	2016-06-16 18:06:02 -07:00
Arnaud Porterie (icecrime)	0b871ed824	Make --dispatcher-heartbeat-period a duration ... Make `--dispatcher-heartbeat-period` a duration in `docker swarm update`, allowing to express the value as "5s", "1h", etc. Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com> Upstream-commit: e6e1fd5d0657c3ab5b15c2984403e4a4e62ca2bb Component: engine	2016-06-14 18:10:49 -07:00
Amit Shukla	69f307bc8b	CLI docs ... Signed-off-by: Amit Shukla <amit.shukla@docker.com> Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Upstream-commit: 9acf97b72a4d5ff7b1bcad36fb19b53775f01596 Component: engine	2016-06-13 22:17:15 -07:00