On Thu, Jul 09, 2015 at 11:22:36AM +0200, 'Klaus Aehlig' via ganeti-devel wrote:

commit 170e7137ded2d9f06f23d9d14e68faaa9bcadc26
Merge: 9ac307a c8e69c7
Author: Klaus Aehlig <[email protected]>
Date:   Thu Jul 9 11:17:26 2015 +0200

   Merge branch 'stable-2.13' into stable-2.14

   * stable-2.13
     Properly get rid of all watcher jobs
     Move stdout_of to qa_utils

   * stable-2.12
     Tell git to ignore tools/ssl-update
     Use 'exclude_daemons' option for master only
     Disable superfluous restarting of daemons
     Add tests exercising the "crashed" state handling
     Add proper handling of the "crashed" Xen state

   * stable-2.11
     Fix capitalization of TestCase
     Trigger renew-crypto on downgrade to 2.11

   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

LGTM, thanks

Reply via email to