LGTM
On Thu, Jul 17, 2014 at 6:21 PM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote: > > > commit 68ceb42344cc2c3556b2f0a2d4672b3ecadec87c > Merge: 83f957f 130beac > Author: Klaus Aehlig <[email protected]> > Date: Thu Jul 17 18:16:13 2014 +0200 > > Merge branch 'stable-2.12' into master > > * stable-2.12 > Check if the meta-data daemon is enabled in backend > Don't distribute meta-data, if the deamon is disabled > Make the metadata daemon optional during configuration > Fix deamon dependencies in Makefile.am > Add omitted design documents to the Makefile > Fix curious psutil lint error > Fix compilation of really-all target > Fix compiling the project with Haskell profiling enabled > Build the squeeze schroot with profiling enabled > When jobs fail to start, include the appropriate message > Fix syntax and lint errors from the previous patch series > Verify the read config. in ConfigWriter only when offline > Don't verify the configuration before each write to WConfd > Don't warn about DRBD map check in the logs > QA: Flush the configuration before doing master failover > Print captured stdout content in QA jobs > Fix a typo in the QA test for opportunistic locking > > * stable-2.11 > (no changes) > > * stable-2.10 > Adapt relative path expansion in PATH to new environment > Exclude archived jobs from configuration backup > Expose early_release for ReplaceInstanceDisks > > * stable-2.9 > Make ganeti-cleaner switch to a save working directory > > Conflicts: > Makefile.am: add ALL the designs! > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc Makefile.am > index d23eb5b,97f63c3..8b3b49b > --- a/Makefile.am > +++ b/Makefile.am > @@@ -590,7 -593,7 +594,8 @@@ docinput = > doc/design-cpu-speed.rst \ > doc/design-daemons.rst \ > doc/design-device-uuid-name.rst \ > + doc/design-disk-conversion.rst \ > + doc/design-disks.rst \ > doc/design-draft.rst \ > doc/design-file-based-storage.rst \ > doc/design-glusterfs-ganeti-support.rst \ > > > -- > 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 >
