Re: [PATCH master 03/10] Support replacing an instance on creation

['Niklas Hambuechen' via ganeti-devel]

On 12/03/2014 06:42 PM, Klaus Aehlig wrote:

@@ -1795,10 +1798,13 @@ class ConfigWriter(object):
    def _CheckUUIDpresent(self, item):
      """Checks that an object with the given UUID exists.

+    @param: the instance or other UUID possessing object to verify that
+        its UUID is present
+

Here the interdiff introduced an error; I'd like to fix it with
the following interdiff.

commit 47ce40a1971965f34a5baf677a543393b1bdb01b
Author: Klaus Aehlig <aeh...@google.com>
Date:   Wed Dec 3 18:41:21 2014 +0100

     Interdiff: Support replacing an instance on creation

diff --git a/lib/config/__init__.py b/lib/config/__init__.py
index 2e09d6f..cca2675 100644
--- a/lib/config/__init__.py
+++ b/lib/config/__init__.py
@@ -1798,7 +1798,7 @@ class ConfigWriter(object):
    def _CheckUUIDpresent(self, item):
      """Checks that an object with the given UUID exists.

-    @param: the instance or other UUID possessing object to verify that
+    @param item: the instance or other UUID possessing object to verify that
          its UUID is present

      """

LGTM

--
Niklas Hambüchen
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores