From e2913a3d61e88e996277bb6cd7abae36a39a4a1f Mon Sep 17 00:00:00 2001 From: Dan Mace Date: Thu, 19 Mar 2015 11:03:33 -0400 Subject: [PATCH] Fix panic during timeout Fix a nil pointer deference. Closes #1371. --- pkg/deploy/strategy/recreate/recreate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/deploy/strategy/recreate/recreate.go b/pkg/deploy/strategy/recreate/recreate.go index 20ba492b0675..5504ffc77905 100644 --- a/pkg/deploy/strategy/recreate/recreate.go +++ b/pkg/deploy/strategy/recreate/recreate.go @@ -79,7 +79,7 @@ func (s *RecreateDeploymentStrategy) updateReplicas(namespace, name string, repl for { select { case <-timeout: - return fmt.Errorf("Couldn't successfully update deployment %s replica count to %d (timeout exceeded)", deployment.Name, replicaCount) + return fmt.Errorf("Couldn't successfully update deployment %s/%s replica count to %d (timeout exceeded)", namespace, name, replicaCount) default: if deployment, err = s.client.getReplicationController(namespace, name); err != nil { glog.Errorf("Couldn't get deployment %s/%s: %v", namespace, name, err)