Merge branch 'stable-2.14' into stable-2.15

* 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:
	NEWS: take all additions
	configure.ac: keep all version information
	    from stable-2.15

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

diff --cc NEWS
index 913e4a8,c6f0739..cfd8719
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,50 -2,37 +2,81 @@@ New
  ====
  
  
 +Version 2.15.0 rc1
 +------------------
 +
 +*(Released Wed, 17 Jun 2015)*
 +
 +Incompatible/important changes
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +- In order to improve allocation efficiency when using DRBD, the cluster
 +  metric now takes the total reserved memory into account. A consequence
 +  of this change is that the best possible cluster metric is no longer 0.
 +  htools(1) interprets minimal cluster scores to be offsets of the theoretical
 +  lower bound, so only users interpreting the cluster score directly should
 +  be affected.
 +
 +New features
 +~~~~~~~~~~~~
 +
 +- On dedicated clusters, hail will now favour allocations filling up
 +  nodes efficiently over balanced allocations.
 +
 +New dependencies
 +~~~~~~~~~~~~~~~~
 +
 +- The indirect dependency on Haskell package 'case-insensitive' is now
 +  explicit.
 +
 +Known issues:
 +~~~~~~~~~~~~~
 +
 +- Issue 1094: differences in encodings in SSL certificates due to
 +  different OpenSSL versions can result in rendering a cluster
 +  uncommunicative after a master-failover.
 +
 +
 +Version 2.15.0 beta1
 +--------------------
 +
 +*(Released Thu, 30 Apr 2015)*
 +
 +This was the second beta release in the 2.15 series. All important changes
 +are listed in the latest 2.15 entry.
 +
 +
+ Version 2.14.1
+ --------------
+ 
+ *(Released Fri, 10 Jul 2015)*
+ 
+ Incompatible/important changes
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
+ - The SSH security changes reduced the number of nodes which can SSH into
+   other nodes. Unfortunately enough, the Ganeti implementation of migration
+   for the xl stack of Xen required SSH to be able to migrate the instance,
+   leading to a situation where full movement of an instance around the cluster
+   was not possible. This version fixes the issue by using socat to transfer
+   instance data. While socat is less secure than SSH, it is about as secure as
+   xm migrations, and occurs over the secondary network if present. As a
+   consequence of this change, Xen instance migrations using xl cannot occur
+   between nodes running 2.14.0 and 2.14.1.
+ - This release contains a fix for the problem that different encodings in
+   SSL certificates can break RPC communication (issue 1094). The fix makes
+   it necessary to rerun 'gnt-cluster renew-crypto --new-node-certificates'
+   after the cluster is fully upgraded to 2.14.1
+ 
+ Other Changes
+ ~~~~~~~~~~~~~
+ 
+ - The ``htools`` now properly work also on shared-storage clusters.
+ - Instance moves now work properly also for the plain disk template.
+ - Filter-evaluation for run-time data filter was fixed (issue 1100).
+ - Various improvements to the documentation have been added.
+ 
+ 
  Version 2.14.0
  --------------
  

diff --cc src/Ganeti/HTools/Cluster.hs
Simple merge