LGTM, thanks
On Mon, Mar 24, 2014 at 7:29 PM, Klaus Aehlig <[email protected]> wrote: > > > commit 91aca7e75ae66bf0c89867d465a74275d96d3731 > Merge: 937ff98 df376ff > Author: Klaus Aehlig <[email protected]> > Date: Mon Mar 24 19:18:33 2014 +0100 > > Merge branch 'stable-2.11' into master > > * stable-2.11 > Rearranging entries in NEWS file > Prepare NEWS file for 2.11.0 rc1 > Bump version to 2.11~rc1 in configure.ac > > * stable-2.10 > Bump version to 2.10.2 > Prepare NEWS file for 2.10.2 > Allow releases scheduled 5 days in advance > > * stable-2.9 > Make watcher submit queries low priority > > * stable-2.8 > Include qa/patch in Makefile > 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: > NEWS: take all additions > configure.ac: ignore revision/suffix bump > qa/qa_rapi.py: trivial > qa/qa_utils.py: trivial > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc Makefile.am > index edc7fb5,ed39ec9..5deaffb > --- a/Makefile.am > +++ b/Makefile.am > @@@ -1054,8 -1000,8 +1055,9 @@@ qa_scripts = > qa/qa_instance.py \ > qa/qa_instance_utils.py \ > qa/qa_job.py \ > + qa/qa_job_utils.py \ > qa/qa_monitoring.py \ > + qa/qa_logging.py \ > qa/qa_node.py \ > qa/qa_os.py \ > qa/qa_rapi.py \ > diff --cc NEWS > index 7dc2851,3e0c8a8..4da3552 > --- a/NEWS > +++ b/NEWS > @@@ -2,41 -2,10 +2,41 @@@ New > ==== > > > +Version 2.12.0 alpha1 > +--------------------- > + > +*(unreleased)* > + > +Incompatible/important changes > +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > + > +- Do not use debug mode in production. Certain daemons will issue > warnings > + when launched in debug mode. Some debug logging violates some of the > new > + invariants in the system (see "New features"). The logging has been > kept as > + it aids diagnostics and development. > + > +New features > +~~~~~~~~~~~~ > + > +- OS install script parameters now come in public, private and secret > + varieties: > + > + - Public parameters are like all other parameters in Ganeti. > + - Ganeti will not log private and secret parameters, *unless* it is > running > + in debug mode. > + - Ganeti will not save secret parameters to configuration. Secret > parameters > + must be supplied every time you install, or reinstall, an instance. > + - Attempting to override public parameters with private or secret > parameters > + results in an error. Similarly, you may not use secret parameters to > + override private parameters. > + - The move-instance tool can now attempt to allocate an instance by > using > + opportunistic locking when an iallocator is used. > + > + > - Version 2.11.0 beta1 > - -------------------- > + Version 2.11.0 rc1 > + ------------------ > > - *(Released Wed, 5 Mar 2014)* > + *(Released Thu, 20 Mar 2014)* > > Incompatible/important changes > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > @@@ -91,10 -61,48 +92,52 @@@ For Haskell > - ``base64-bytestring`` library (http://hackage.haskell.org/package/zlib > ), > at least version 1.0.0.0 > > +- ``lifted-base`` library ( > http://hackage.haskell.org/package/lifted-base) > + > +- ``lens`` library (http://hackage.haskell.org/package/lens) > + > + Since 2.11.0 beta1 > + ~~~~~~~~~~~~~~~~~~ > + > + This was the first RC release of the 2.11 series. Since 2.11.0 beta1: > + > + - Convert int to float when checking config. consistency > + - Rename compression option in gnt-backup export > + > + Inherited from the 2.9 branch: > + > + - Fix error introduced during merge > + - gnt-cluster copyfile: accept relative paths > + > + Inherited from the 2.8 branch: > + > + - Improve RAPI detection of the watcher > + - Add patching QA configuration files on buildbots > + - Enable a timeout for instance shutdown > + - Allow KVM commands to have a timeout > + - Allow xen commands to have a timeout > + - Fix wrong docstring > + > + > + Version 2.11.0 beta1 > + -------------------- > + > + *(Released Wed, 5 Mar 2014)* > + > + This was the first beta release of the 2.11 series. All important changes > + are listed in the latest 2.11 entry. > + > + > + Version 2.10.2 > + -------------- > + > + *(Released Mon, 24 Mar 2014)* > + > + - Fix conflict between virtio + spice or soundhw (issue 757) > + - accept relative paths in gnt-cluster copyfile (issue 754) > + - Introduce shutdown timeout for 'xm shutdown' command > + - Improve RAPI detection of the watcher (issue 752) > + > > Version 2.10.1 > -------------- > diff --cc qa/qa_rapi.py > index 3fa3c13,5e6904c..73a97d3 > --- a/qa/qa_rapi.py > +++ b/qa/qa_rapi.py > @@@ -47,12 -46,12 +47,13 @@@ import ganeti.rapi.client_util > > import qa_config > import qa_error > + import qa_logging > import qa_utils > > +from qa_instance import IsDiskReplacingSupported > from qa_instance import IsFailoverSupported > from qa_instance import IsMigrationSupported > -from qa_instance import IsDiskReplacingSupported > +from qa_job_utils import RunWithLocks > from qa_utils import (AssertEqual, AssertIn, AssertMatch, > StartLocalCommand) > from qa_utils import InstanceCheck, INST_DOWN, INST_UP, FIRST_ARG > > diff --cc qa/qa_utils.py > index d2295c6,aa8d73d..8b9c85b > --- a/qa/qa_utils.py > +++ b/qa/qa_utils.py > @@@ -72,42 -69,7 +69,7 @@@ _QA_OUTPUT = pathutils.GetLogFilename(" > RETURN_VALUE) = range(1000, 1002) > > > - def _SetupColours(): > - """Initializes the colour constants. > - > - """ > - # pylint: disable=W0603 > - # due to global usage > - global _INFO_SEQ, _WARNING_SEQ, _ERROR_SEQ, _RESET_SEQ > - > - # Don't use colours if stdout isn't a terminal > - if not sys.stdout.isatty(): > - return > - > - try: > - import curses > - except ImportError: > - # Don't use colours if curses module can't be imported > - return > - > - try: > - curses.setupterm() > - except curses.error: > - # Probably a non-standard terminal, don't use colours then > - return > - > - _RESET_SEQ = curses.tigetstr("op") > - > - setaf = curses.tigetstr("setaf") > - _INFO_SEQ = curses.tparm(setaf, curses.COLOR_GREEN) > - _WARNING_SEQ = curses.tparm(setaf, curses.COLOR_YELLOW) > - _ERROR_SEQ = curses.tparm(setaf, curses.COLOR_RED) > - > - > - _SetupColours() > - > - > -def AssertIn(item, sequence): > +def AssertIn(item, sequence, msg=""): > """Raises an error when item is not in sequence. > > """ > > -- > Klaus Aehlig > Google Germany GmbH, Dienerstr. 12, 80331 Muenchen > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores >
