On Mon, Oct 12, 2015 at 11:41:33AM -0400, 'Hrvoje Ribicic' via ganeti-devel wrote: > commit 522357dc09ade3d1a72c999d32f26bad56d2e587 > Merge: 87ec22e 32cb9b9 > Author: Hrvoje Ribicic <[email protected]> > Date: Mon Oct 12 17:11:38 2015 +0200 > > Merge branch 'stable-2.15' into stable-2.16 > > * stable-2.15 > For queries, take the correct base address of an IP block > Fix computation in network blocks > > * stable-2.14 > Add test for tags accounting in hail > Set node tags in iallocator htools backend > > * stable-2.13 > Improve xl socat migrations > > * stable-2.12 > QA: Retrieve only the RAPI certificate > QA: Allow usage of specific RAPI certificates and files > QA: Reload certificates only when renew-crypto has been run > QA: Restart Ganeti after adding the RAPI users file > QA: Add reading the RAPI password from a file > QA: Allow the RAPI user to be set > QA: Do not remove nodes from cluster without destroying it > QA: Refactor RAPI handling > Increase default disk size of burnin to 1G > break line with more than 80 characters > Only search for Python-2 interpreters > Fix faulty comments / indentation > Handle Xen 4.3 states better > > * stable-2.11 > (no changes) > > * stable-2.10 > Add a test for parsing of admin_state in IAlloc backend > At IAlloc backend guess state from admin state > > * stable-2.9 > Update harep's man page to notify users of its limitations > > Conflicts: > htools-hail.test: merged tests > > Signed-off-by: Hrvoje Ribicic <[email protected]>
LGTM. Thanks. -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Matthew Scott Sucherman, Paul Terence Manicle
