LGTM, thanks
On Wed, Mar 5, 2014 at 1:15 PM, Klaus Aehlig <[email protected]> wrote: > > > commit ffa710d82b559112e93db110ee5d99fa128c7925 > Merge: a6986cf f1638b0 > Author: Klaus Aehlig <[email protected]> > Date: Wed Mar 5 13:10:58 2014 +0100 > > Merge branch 'stable-2.11' into master > > * stable-2.11 > Convert int to float when checking config. consistency > Updateing release date to tomorrow > Revision bump for the 2.11.0~beta1 release > Set release date of 2.11 beta1 > Stop watcher from restarting down instances during an opcode > > Conflicts: > NEWS: take both additions > lib/watcher/__init__.py: manually apply the client > change to the version on 2.11 > > Semantical conflicts: > configure.ac: undo suffix bump > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc NEWS > index 77027a8,87fedcb..620361a > --- 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 alpha1 > - --------------------- > + Version 2.11.0 beta1 > + -------------------- > > - *(unreleased)* > + *(Released Wed, 5 Mar 2014)* > > Incompatible/important changes > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > diff --cc lib/watcher/__init__.py > index d8a0d22,7131a95..affd6ac > --- a/lib/watcher/__init__.py > +++ b/lib/watcher/__init__.py > @@@ -749,7 -767,8 +766,7 @@@ def _GroupWatcher(opts) > > _CheckMaster(client) > > - (nodes, instances) = _GetGroupData(client, group_uuid) > - (nodes, instances, locks) = _GetGroupData(query_client, group_uuid) > ++ (nodes, instances, locks) = _GetGroupData(client, group_uuid) > > # Update per-group instance status file > _UpdateInstanceStatus(inst_status_path, instances.values()) > > -- > 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 >
