Merge branch 'devel-2.5'

* devel-2.5:
  Use --yes to deactivate master ip in cluster merge
  Use deactivate-master-ip in cluster-merge
  Add gnt-cluster commands to toggle the master IP
  Split starting and stopping master IP and daemons
  listrunner: Don't pass arguments if there are none
  ssh: Quote strings in error message
  utils.log: Write error messages to stderr
  Add signal handling doc to hbal man page
  Migration: warn the user about hv version mismatch
  Fix handling of cluster verify hooks
  Redistribute the RAPI certificate
  QA: Add tests for instance start/stop via RAPI
  RAPI: Fix wrong check on instance shutdown
  baserlib: Accept empty body in FillOpcode

Conflicts:
	lib/backend.py
   - no real conflicts
	lib/constants.py
   - preserve both changes
	lib/rapi/rlib2.py
   - keep master
	lib/rpc.py
   - no real conflicts
	tools/cluster-merge
   - keep devel-2.5

Signed-off-by: Andrea Spadaccini <spadaccio@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

diff --cc lib/backend.py
Simple merge

diff --cc lib/cmdlib.py
Simple merge

diff --cc lib/constants.py
index 9dc202b,fd9cc7c..2b92284
--- 1/lib/constants.py
--- 2/lib/constants.py
+++ b/lib/constants.py
@@@ -797,27 -776,9 +797,30 @@@ HVS_PARAMETER_TYPES = 
  
  HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys())
  
 +# Migration statuses
 +HV_MIGRATION_COMPLETED = "completed"
 +HV_MIGRATION_ACTIVE = "active"
 +HV_MIGRATION_FAILED = "failed"
 +HV_MIGRATION_CANCELLED = "cancelled"
 +
 +HV_MIGRATION_VALID_STATUSES = frozenset([
 +  HV_MIGRATION_COMPLETED,
 +  HV_MIGRATION_ACTIVE,
 +  HV_MIGRATION_FAILED,
 +  HV_MIGRATION_CANCELLED,
 +  ])
 +
 +HV_MIGRATION_FAILED_STATUSES = frozenset([
 +  HV_MIGRATION_FAILED,
 +  HV_MIGRATION_CANCELLED,
 +  ])
 +
 +# KVM-specific statuses
 +HV_KVM_MIGRATION_VALID_STATUSES = HV_MIGRATION_VALID_STATUSES
 +
+ # Node info keys
+ HV_NODEINFO_KEY_VERSION = "hv_version"
+ 
  # Backend parameter names
  BE_MEMORY = "memory"
  BE_VCPUS = "vcpus"

diff --cc lib/hypervisor/hv_kvm.py
Simple merge

diff --cc lib/hypervisor/hv_xen.py
Simple merge

diff --cc man/hbal.rst
Simple merge