Merge pull request #60 from seemethere/cherry_pick_144

Allow --detach and --quiet flags when using --rollback
2017-06-10 15:48:54 -07:00
parent f7e9f2cefa 5ed0b2e10c
commit 47c1b00158
1 changed files with 1 additions and 1 deletions
@@ -131,7 +131,7 @@ func runUpdate(dockerCli *command.DockerCli, flags *pflag.FlagSet, options *serv
 		// Rollback can't be combined with other flags.
 		otherFlagsPassed := false
 		flags.VisitAll(func(f *pflag.Flag) {
-			if f.Name == "rollback" {
+			if f.Name == "rollback" || f.Name == "detach" || f.Name == "quiet" {
 				return
 			}
 			if flags.Changed(f.Name) {