LGTM, thanks
On Thu, Apr 17, 2014 at 11:21 AM, Thomas Thrainer <[email protected]>wrote: > The cherry-picked function _GetOutputFromMaster() calls > GetCommandOutput() with parameters only present in newer Ganeti > branches. Remove those parameters as they cause errors in stable-2.10. > > Signed-off-by: Thomas Thrainer <[email protected]> > --- > > Sorry, small follow up patch to the cherry-picked functions... > > qa/qa_job_utils.py | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/qa/qa_job_utils.py b/qa/qa_job_utils.py > index 973c2a0..1c321d3 100644 > --- a/qa/qa_job_utils.py > +++ b/qa/qa_job_utils.py > @@ -55,8 +55,7 @@ def _GetOutputFromMaster(cmd, use_multiplexer=True, > log_cmd=True): > # buildbot > cmdstr += " 2>&1" > > - return GetCommandOutput(qa_config.GetMasterNode().primary, cmdstr, > - use_multiplexer=use_multiplexer, > log_cmd=log_cmd) > + return GetCommandOutput(qa_config.GetMasterNode().primary, cmdstr) > > > def ExecuteJobProducingCommand(cmd): > -- > 1.9.1.423.g4596e3a > > -- -- Helga Velroyen | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
