commit f57b57da49bbf10e8d3295e31aeefa054fa2082a
Merge: b5b33f9 f616b87
Author: Klaus Aehlig <[email protected]>
Date: Thu Jul 16 15:43:58 2015 +0200
Merge branch 'stable-2.15' into stable-2.16
* stable-2.15
(no changes)
* stable-2.14
Do not version generate file tools/ssl-update
Revision bump for 2.14.1
Update NEWS for 2.14.1
* stable-2.13
NEWS: move 2.13.0 beta/rc to their place
Document data collector options
Correct NEWS file entry
Revision bump for 2.13.2
Update the NEWS file for 2.13.2
* stable-2.12
Bugfix in checkInstanceMove function in Cluster.hs
Revision bump for 2.12.5
Update the NEWS file for 2.12.5
Update Xen documentation in install.rst
Clarify need for the migration_port Xen param
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
