commit 4645eb0fa10c8fbe6eaf2b7fb9a8b13add63f8fc
Merge: e2bac8e f21bdec
Author: Klaus Aehlig <[email protected]>
Date: Mon Jul 27 11:07:36 2015 +0200
Merge branch 'stable-2.14' into stable-2.15
* stable-2.14
Revert 2.12-specific downgrade action on 2.14
* stable-2.13
Add ``--no-ssh-key-check`` to manpage of renew-crypto
Redistribute master key on downgrade
Use ssconf port map when handling SSH keys
Make node_daemon_setup use common functions
Add docstring to certificate verification
* stable-2.12
Also provide default arguments for mond
Support sphinx 1.3
Make documentation for -H serial_console more explicit
* stable-2.11
(no changes)
* stable-2.10
Fix typo in secondary
When hinting to do gnt-instance info, show the instance
Update gnt-network example in admin page
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