Skip to content
  • Klaus Aehlig's avatar
    Merge branch 'stable-2.16' into master · bba728bf
    Klaus Aehlig authored
    
    
    * stable-2.16
      (no changes)
    
    * 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
    
    Conflicts:
    	man/gnt-cluster.rst: take all additions
    
    Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
    Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
    bba728bf