commit 41f6abde543f50d934d1ad5e4c72872edfd361d2
Merge: a665b34 e36f73a
Author: Klaus Aehlig <[email protected]>
Date: Wed Jul 8 18:09:30 2015 +0200
Merge branch 'stable-2.12' into stable-2.13
* 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
Conflicts:
.gitignore: use all additions
Signed-off-by: Klaus Aehlig <[email protected]>
diff --cc .gitignore
index 2939086,d6344d6..2c03279
--- a/.gitignore
+++ b/.gitignore
@@@ -134,7 -134,7 +134,8 @@@
/tools/node-daemon-setup
/tools/prepare-node-join
/tools/shebang/
+/tools/ssh-update
+ /tools/ssl-update
# scripts
/scripts/gnt-backup
--
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
