LGTM On Mon, Jan 19, 2015 at 06:07:49PM +0100, 'Klaus Aehlig' via ganeti-devel wrote: > > commit 5c54573d6b6ee0c3c1a6acf7268e9d05d3e6fe1e > Merge: 4379403 fbe43b7 > Author: Klaus Aehlig <[email protected]> > Date: Mon Jan 19 18:00:03 2015 +0100 > > Merge branch 'stable-2.13' into stable-2.14 > > * stable-2.13 > Add a test verifying --ignore-soft-errors in hail > Pass on options in nodeEvacInstance for ChangePrimary > HTools: Pass --ignore-soft-errors all the way through > Make tags a soft error > Mention tags in --restricted-migration man page entry > Ignore spurious pylint warnings > Fix output in case of ExtStorage attach error > Fix gnt-storage diagnose in case of missing files > Revision bump to 2.13.0~beta1 > Prepare the NEWS file for 2.13.0~beta1 > Update the rst files for 2.13 > Add a note about downgrades wrt to SSH key handling > Add check for >1 disk used with the LXC hypervisor > Update years in copyright disclaimer for LXC files > Use DSA SSH keys only > > * stable-2.12 > Revision bump to 2.12.1 > Prepare the NEWS file for the new 2.12.1 release > > Conflicts: > NEWS > src/Ganeti/HTools/Cluster.hs > src/Ganeti/HTools/Node.hs > src/Ganeti/HTools/Program/Hspace.hs > test/hs/Test/Ganeti/HTools/Backend/Text.hs > > Resolution: > NEWS: take all additions; Rest: give > preference to stable-2.14 version > > Semantic Conflict: > Ignore suffix bump in configure.ac > > diff --cc NEWS > index 2e46ccd,8756fee..365453c > --- a/NEWS > +++ b/NEWS > @@@ -2,34 -2,10 +2,34 @@@ New > ==== > > > +Version 2.14.0 > +-------------- > + > +*(unreleased)* > + > +New features > +~~~~~~~~~~~~ > + > +- The build system now enforces external Haskell dependencies to lie in > + a supported range as declared by our new ganeti.cabal file. > +- Basic support for instance reservations has been added. Instance addition > + supports a --forthcoming option telling Ganeti to only reserve the > resources > + but not create the actual instance. The instance can later be created with > + by passing the --commit option to the instance addition command. > +- Node tags starting with htools:nlocation: now have a special meaning to > htools(1). > + They control between which nodes migration is possible, e.g., during > hypervisor > + upgrades. See hbal(1) for details. > + > +New dependencies > +~~~~~~~~~~~~~~~~ > + > +- Building the Haskell part of Ganeti now requires Cabal and cabal-install. > + > + > - Version 2.13.0 > - -------------- > + Version 2.13.0 beta1 > + -------------------- > > - *(unreleased)* > + *(Released Wed, 14 Jan 2015)* > > Incompatible/important changes > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > -- > 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
-- 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
