From b7bf8b581cda9a6f370318f57fd508b1c5892529 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Tue, 23 Aug 2011 13:42:33 +0100
Subject: [PATCH] Wrap a few long lines

Had to break it as well, today! ;)

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
 tools/cluster-merge | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/cluster-merge b/tools/cluster-merge
index a8e3af6f0..f40b05881 100755
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -81,11 +81,11 @@ RESTART_OPT = cli.cli_option("--restart", default=_RESTART_ALL,
                                    " same name (One of: %s/%s/%s)" %
                                    _RESTART_CHOICES))
 
-SKIP_STOP_INSTANCES_OPT = cli.cli_option("--skip-stop-instances", default=True,
-                                         action="store_false", dest="stop_instances",
-                                         help=("Don't stop the instances on the"
-                                               " clusters, just check that none"
-                                               " is running"))
+SKIP_STOP_INSTANCES_OPT = \
+  cli.cli_option("--skip-stop-instances", default=True, action="store_false",
+                 dest="stop_instances",
+                 help=("Don't stop the instances on the clusters, just check "
+                       "that none is running"))
 
 
 def Flatten(unflattened_list):
-- 
GitLab