Please ignore this merge, I just realized that the changes in 2.8 are causing doclint to fail, so I won't merge them now.
On Thu, Mar 20, 2014 at 8:35 AM, Thomas Thrainer <[email protected]>wrote: > commit e829c4374e100b7420646cb22a42365fcde4c43c > Merge: ddc6458 7488cf4 > Author: Thomas Thrainer <[email protected]> > Date: Thu Mar 20 08:30:46 2014 +0100 > > Merge branch 'stable-2.8' into stable-2.9 > > * stable-2.8 > Handle empty patches better > Move message formatting functions to separate file > Add optional ordering of QA patch files > Allow multiple QA patches > Refactor current patching code > > Conflicts: > Makefile.am (include all added files) > qa/qa_cluster.py (trivial) > > diff --cc Makefile.am > index 1e17f79,9fc00b0..f125182 > --- a/Makefile.am > +++ b/Makefile.am > @@@ -846,9 -808,8 +846,10 @@@ qa_scripts = > qa/qa_error.py \ > qa/qa_group.py \ > qa/qa_instance.py \ > + qa/qa_instance_utils.py \ > qa/qa_job.py \ > - qa/qa_logging.py \ > + qa/qa_monitoring.py \ > ++ qa/qa_logging.py \ > qa/qa_node.py \ > qa/qa_os.py \ > qa/qa_rapi.py \ > diff --cc qa/qa_cluster.py > index 5d19317,ecdf369..9baed56 > --- a/qa/qa_cluster.py > +++ b/qa/qa_cluster.py > @@@ -33,10 -33,10 +33,11 @@@ from ganeti import util > from ganeti import pathutils > > import qa_config > +import qa_daemon > - import qa_utils > import qa_error > import qa_instance > + import qa_logging > + import qa_utils > > from qa_utils import AssertEqual, AssertCommand, GetCommandOutput > > -- Thomas Thrainer | 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
