Merge commit 'origin/branch-2.1' into feature/containers

* commit 'origin/branch-2.1': (66 commits)
  Add automated disk repair changes to design doc
  Add review script
  Implement “gnt-node physical-volumes” command
  Add new opcode to list physical volumes
  storage: Use constants.py instead of local constants
  storage: Fix semantics for directory size
  Add “gnt-job watch” command
  jqueue: Fix error when WaitForJobChange gets invalid ID
  jqueue: Update message for cancelling running job
  cmdlib: Change tasklet logging to debug level
  rapi: Add /2/nodes/[node_name]/migrate resource
  gnt-node: Use new opcode to migrate node
  cmdlib: Add new opcode to migrate node
  rapi: Add default parameter to _checkIntVariable
  cmdlib: Add logging for tasklets
  cmdlib: Fix tasklets handling if no tasklets are added
  rapi: Add /2/[node_name]/evacuate resource
  Add information about storage units framework
  Add RPC calls for storage unit list
  Add first implementation of generic storage unit framework
  ...

diff --cc Makefile.am
Simple merge

diff --cc lib/constants.py
Simple merge

diff --cc lib/hypervisor/__init__.py
index c2da114,453286c..f896219
--- 1/lib/hypervisor/__init__.py
--- 2/lib/hypervisor/__init__.py
+++ b/lib/hypervisor/__init__.py
@@@ -33,19 -32,18 +33,19 @@@ from ganeti.hypervisor import hv_chroo
  
  
  _HYPERVISOR_MAP = {
 -    constants.HT_XEN_PVM: hv_xen.XenPvmHypervisor,
 -    constants.HT_XEN_HVM: hv_xen.XenHvmHypervisor,
 -    constants.HT_FAKE: hv_fake.FakeHypervisor,
 -    constants.HT_KVM: hv_kvm.KVMHypervisor,
 -    }
 +  constants.HT_XEN_PVM: hv_xen.XenPvmHypervisor,
 +  constants.HT_XEN_HVM: hv_xen.XenHvmHypervisor,
 +  constants.HT_FAKE: hv_fake.FakeHypervisor,
 +  constants.HT_KVM: hv_kvm.KVMHypervisor,
 +  constants.HT_CHROOT: hv_chroot.ChrootManager,
 +  }
  
  
- def GetHypervisor(ht_kind):
-   """Return a Hypervisor instance.
+ def GetHypervisorClass(ht_kind):
+   """Return a Hypervisor class.
  
-   This function parses the cluster hypervisor configuration file and
-   instantiates a class based on the value of this file.
+   This function returns the hypervisor class corresponding to the
+   given hypervisor name.
  
    @type ht_kind: string
    @param ht_kind: The requested hypervisor type