Revision 5ae4945a tools/cluster-merge

b/tools/cluster-merge
1 1
#!/usr/bin/python
2 2
#
3 3

  
4
# Copyright (C) 2010 Google Inc.
4
# Copyright (C) 2010, 2012 Google Inc.
5 5
#
6 6
# This program is free software; you can redistribute it and/or modify
7 7
# it under the terms of the GNU General Public License as published by
......
253 253
    """
254 254
    for _ in range(max_attempts):
255 255
      result = self.ssh_runner.Run(hostname=hostname, command=command,
256
                                 user=user, use_cluster_key=use_cluster_key,
257
                                 strict_host_check=strict_host_check,
258
                                 private_key=private_key, batch=batch,
259
                                 ask_key=ask_key)
256
                                   user=user, use_cluster_key=use_cluster_key,
257
                                   strict_host_check=strict_host_check,
258
                                   private_key=private_key, batch=batch,
259
                                   ask_key=ask_key)
260 260
      if not result.failed:
261 261
        break
262 262

  
......
659 659
    if result.failed:
660 660
      raise errors.CommandError("Redistribution failed. Fail reason: %s;"
661 661
                                " output: %s" % (result.fail_reason,
662
                                                result.output))
662
                                                 result.output))
663 663

  
664 664
  # R0201: Method could be a function
665 665
  def _StartupAllInstances(self): # pylint: disable=R0201

Also available in: Unified diff