Browse code

Merge pull request #31775 from erxian/misleading-default-for-update-monitor-duration-flag

misleading default for --update-monitor duration

Vincent Demeester authored on 2017/03/16 18:13:26
Showing 3 changed files
... ...
@@ -489,7 +489,7 @@ func addServiceFlags(flags *pflag.FlagSet, opts *serviceOptions) {
489 489
 
490 490
 	flags.Uint64Var(&opts.update.parallelism, flagUpdateParallelism, 1, "Maximum number of tasks updated simultaneously (0 to update all at once)")
491 491
 	flags.DurationVar(&opts.update.delay, flagUpdateDelay, time.Duration(0), "Delay between updates (ns|us|ms|s|m|h) (default 0s)")
492
-	flags.DurationVar(&opts.update.monitor, flagUpdateMonitor, time.Duration(0), "Duration after each task update to monitor for failure (ns|us|ms|s|m|h) (default 0s)")
492
+	flags.DurationVar(&opts.update.monitor, flagUpdateMonitor, time.Duration(0), "Duration after each task update to monitor for failure (ns|us|ms|s|m|h)")
493 493
 	flags.SetAnnotation(flagUpdateMonitor, "version", []string{"1.25"})
494 494
 	flags.StringVar(&opts.update.onFailure, flagUpdateFailureAction, "pause", `Action on update failure ("pause"|"continue"|"rollback")`)
495 495
 	flags.Var(&opts.update.maxFailureRatio, flagUpdateMaxFailureRatio, "Failure rate to tolerate during an update")
... ...
@@ -71,7 +71,7 @@ Options:
71 71
       --update-delay duration              Delay between updates (ns|us|ms|s|m|h) (default 0s)
72 72
       --update-failure-action string       Action on update failure ("pause"|"continue"|"rollback") (default "pause")
73 73
       --update-max-failure-ratio float     Failure rate to tolerate during an update
74
-      --update-monitor duration            Duration after each task update to monitor for failure (ns|us|ms|s|m|h) (default 0s)
74
+      --update-monitor duration            Duration after each task update to monitor for failure (ns|us|ms|s|m|h)
75 75
       --update-parallelism uint            Maximum number of tasks updated simultaneously (0 to update all at once) (default 1)
76 76
   -u, --user string                        Username or UID (format: <name|uid>[:<group|gid>])
77 77
       --with-registry-auth                 Send registry authentication details to swarm agents
... ...
@@ -84,7 +84,7 @@ Options:
84 84
       --update-delay duration              Delay between updates (ns|us|ms|s|m|h) (default 0s)
85 85
       --update-failure-action string       Action on update failure ("pause"|"continue"|"rollback") (default "pause")
86 86
       --update-max-failure-ratio float     Failure rate to tolerate during an update
87
-      --update-monitor duration            Duration after each task update to monitor for failure (ns|us|ms|s|m|h) (default 0s)
87
+      --update-monitor duration            Duration after each task update to monitor for failure (ns|us|ms|s|m|h) 
88 88
       --update-parallelism uint            Maximum number of tasks updated simultaneously (0 to update all at once) (default 1)
89 89
   -u, --user string                        Username or UID (format: <name|uid>[:<group|gid>])
90 90
       --with-registry-auth                 Send registry authentication details to swarm agents