Merge branch 'stable-2.9' into stable-2.10

[Hrvoje Ribicic]

commit d8b62254117cc918c32fb8885ebd919be3073aca
Merge: f22348c d65f349
Author: Hrvoje Ribicic <r...@google.com>
Date:   Thu Mar 27 16:19:45 2014 +0000

    Merge branch 'stable-2.9' into stable-2.10

    * stable-2.9
      Fix failing gnt-node list-drbd command

    * stable-2.8
      Add reason parameter to RAPI client functions

    Signed-off-by: Hrvoje Ribicic <r...@google.com>

    Conflicts:
        lib/rapi/client.py

diff --cc lib/rapi/client.py
index c2bc03d,4ad1d16..4b4969d
--- a/lib/rapi/client.py
+++ b/lib/rapi/client.py
@@@ -831,7 -881,7 +881,7 @@@ class GanetiRapiClient(object): # pylin
      return self._SendRequest(HTTP_POST, "/%s/instances" %
GANETI_RAPI_VERSION,
                               query, body)

-   def DeleteInstance(self, instance, dry_run=False, **kwargs):
 -  def DeleteInstance(self, instance, dry_run=False, reason=None):
++  def DeleteInstance(self, instance, dry_run=False, reason=None,
**kwargs):
      """Deletes an instance.

      @type instance: str
@@@ -842,15 -894,14 +894,16 @@@

      """
      query = []
 +    body = kwargs
 +
      _AppendDryRunIf(query, dry_run)
+     _AppendReason(query, reason)

      return self._SendRequest(HTTP_DELETE,
                               ("/%s/instances/%s" %
 -                              (GANETI_RAPI_VERSION, instance)), query,
None)
 +                              (GANETI_RAPI_VERSION, instance)), query,
body)

-   def ModifyInstance(self, instance, **kwargs):
+   def ModifyInstance(self, instance, reason=None, **kwargs):
      """Modifies an instance.

      More details for parameters can be found in the RAPI documentation.