LGTM, thanks!
On Wed, Feb 19, 2014 at 10:11 AM, Klaus Aehlig <[email protected]> wrote: > > > commit 431ee39af9d686877f93a7c93fe5db9edc74459f > Merge: 0565f86 c715d05 > Author: Klaus Aehlig <[email protected]> > Date: Wed Feb 19 10:01:39 2014 +0100 > > Merge branch 'stable-2.10' into stable-2.11 > > * stable-2.10 > Revision bump for 2.10.0~rc3 > Update NEWS file for 2.10.0~rc3 > > * stable-2.8 > Fix integer overflow problem in hba > Add missing space > > Conflicts: > NEWS: take both additions > configure.ac: ignore suffix bump > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc NEWS > index 1dd3b97,13f0b3c..c9e98b2 > --- a/NEWS > +++ b/NEWS > @@@ -2,69 -2,10 +2,69 @@@ New > ==== > > > +Version 2.11.0 alpha1 > +--------------------- > + > +*(unreleased)* > + > +Incompatible/important changes > +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > + > +- ``gnt-node list`` no longer shows disk space information for shared > file > + disk templates because it is not a node attribute. (For example, if > you have > + both the file and shared file disk templates enabled, ``gnt-node > list`` now > + only shows information about the file disk template.) > +- The shared file disk template is now in the new 'sharedfile' storage > type. > + As a result, ``gnt-node list-storage -t file`` now only shows > information > + about the file disk template and you may use ``gnt-node list-storage -t > + sharedfile`` to query storage information for the shared file disk > template. > +- Over luxi, syntactially incorrect queries are now rejected as a whole; > + before, a 'SumbmitManyJobs' request was partially executed, if the > outer > + structure of the request was syntactically correct. As the luxi > protocol > + is internal (external applications are expected to use RAPI), the > impact > + of this incompatible change should be limited. > +- Queries for nodes, instances, groups, backups and networks are now > + exclusively done via the luxi daemon. Legacy python code was removed, > + as well as the --enable-split-queries configuration option. > +- Orphan volumes errors are demoted to warnings and no longer affect the > exit > + code of ``gnt-cluster verify``. > +- RPC security got enhanced by using different client SSL certificates > + for each node. In this context 'gnt-cluster renew-crypto' got a new > + option '--renew-node-certificates', which renews the client > + certificates of all nodes. After a cluster upgrade from pre-2.11, run > + this to create client certificates and activate this feature. > + > +New features > +~~~~~~~~~~~~ > + > +- Instance moves, backups and imports can now use compression to > transfer the > + instance data. > +- Node groups can be configured to use an SSH port different than the > + default 22. > +- Added experimental support for Gluster distributed file storage as the > + ``gluster`` disk template under the new ``sharedfile`` storage type > through > + automatic management of per-node FUSE mount points. You can configure > the > + mount point location at ``gnt-cluster init`` time by using the new > + ``--gluster-storage-dir`` switch. > +- Job scheduling is now handled by luxid, and the maximal number of jobs > running > + in parallel is a run-time parameter of the cluster. > + > +New dependencies > +~~~~~~~~~~~~~~~~ > +The following new dependencies have been added: > + > +For Haskell: > + > +- ``zlib`` library (http://hackage.haskell.org/package/base64-bytestring > ) > + > +- ``base64-bytestring`` library (http://hackage.haskell.org/package/zlib > ), > + at least version 1.0.0.0 > + > + > - Version 2.10.0 rc2 > + Version 2.10.0 rc3 > ------------------ > > - *(Released Fri, 31 Jan 2014)* > + *(Released Wed, 12 Feb 2014)* > > Incompatible/important changes > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > diff --cc src/Ganeti/HTools/Program/Hbal.hs > index a991134,09d611a..dfa2474 > --- a/src/Ganeti/HTools/Program/Hbal.hs > +++ b/src/Ganeti/HTools/Program/Hbal.hs > @@@ -190,9 -204,10 +190,10 @@@ execJobSet anno master nl il cref (js:j > let jobs = map (\(_, idx, move, _) -> > map anno $ Cluster.iMoveToJob nl il idx move) js > descr = map (\(_, idx, _, _) -> Container.nameOf il idx) js > - logfn = putStrLn . ("Got job IDs" ++) . commaJoin . map (show . > fromJobId) > + logfn = > + putStrLn . ("Got job IDs " ++) . commaJoin . map (show . > fromJobId) > putStrLn $ "Executing jobset for instances " ++ commaJoin descr > - jrs <- bracket (L.getClient master) L.closeClient $ > + jrs <- bracket (L.getLuxiClient master) L.closeClient $ > Jobs.execJobsWait jobs logfn > case jrs of > Bad x -> return $ Bad x > > -- > 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 > -- 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
