From a0df810219c67e93d5d2d3cb726c8f6b95a75c54 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 18 Nov 2016 10:15:29 -0500
Subject: [PATCH] Default parallelism to 1.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 7c1b39923505adeb13512d6294855b31102963a6)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
---
 cli/command/stack/deploy.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cli/command/stack/deploy.go b/cli/command/stack/deploy.go
index 3075477b83..ee19741355 100644
--- a/cli/command/stack/deploy.go
+++ b/cli/command/stack/deploy.go
@@ -571,8 +571,12 @@ func convertUpdateConfig(source *composetypes.UpdateConfig) *swarm.UpdateConfig
 	if source == nil {
 		return nil
 	}
+	parallel := uint64(1)
+	if source.Parallelism != nil {
+		parallel = *source.Parallelism
+	}
 	return &swarm.UpdateConfig{
-		Parallelism:     source.Parallelism,
+		Parallelism:     parallel,
 		Delay:           source.Delay,
 		FailureAction:   source.FailureAction,
 		Monitor:         source.Monitor,