LGTM, thanks On Fri, 17 Apr 2015 at 16:38 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> > commit ced50fde76ccdf58944fdeacc87a5e4b202f2741 > Merge: 48d90e7 4aa80e8 > Author: Klaus Aehlig <[email protected]> > Date: Fri Apr 17 16:35:06 2015 +0200 > > Merge branch 'stable-2.15' into master > > * stable-2.15 > Document global N+1 check in hcheck > Describe hcheck --no-capacity-checks in the man page > Add test for hcheck --no-capacity-checks > Make hcheck support --no-capacity-checks > Add a new option for disabling capacity checks > Update version of some docs to 2.15 > > Conflicts: > doc/hooks.rst > doc/iallocator.rst > doc/security.rst > doc/virtual-cluster.rst > Resolution: > Take version strings from master. > > Signed-off-by: Klaus Aehlig <[email protected]> > > > -- > 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 >
