[PATCH stable-2.12] Fix a conflict that occurred in a merge from 2.12

['Petr Pudlak' via ganeti-devel]

Signed-off-by: Petr Pudlak <pud...@google.com>
---
 qa/ganeti-qa.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index d74fa85..ca8ff9d 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -802,7 +802,7 @@ def RunInstanceTests():
         instance = RunTest(create_fun, inodes)
         try:
           RunTestIf("instance-user-down", qa_instance.TestInstanceUserDown,
-                    instance, qa_config.GetMasterNode())
+                    instance)
           RunTestIf("instance-communication",
                     qa_instance.TestInstanceCommunication,
                     instance,
-- 
1.9.1.423.g4596e3a