From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 27 Jan 2011 17:18:19 +0000 (+0100)
Subject: Merge branch 'devel-2.4'
X-Git-Tag: v2.5.0beta1~652
X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/7f0a3ddff058040029ded46c4ad23778e620ba39

Merge branch 'devel-2.4'

* devel-2.4: (34 commits)
  cluster verify: add hvparams verification
  Remove dumb-allocator
  Open other clusters' config in foreign mode
  Add (unused) arg to _OfflineClusterMerge
  Fix unittest breakage on Python 2.4/2.5
  Check for duplicate RAPI URIs and handlers
  Ensure all resources are used by RAPI client
  RAPI client: De-/activating instance disks
  RAPI client: Wrap /2/redistribute-config resource
  Add unittest for RAPI client's ModifyInstance
  Watcher: Fix endless repair tries for broken secondary
  Verify disks: increase parallelism and other fixes
  gnt-cluster verify-disks: fix VG name
  Deactivate disks: allow skipping hypervisor checks
  Wait for master to become available on initialization
  Start all daemons on cluster initialization
  Clarify job processing order in admin guide
  Improve option descriptions
  Remove two unused variables
  Show hidden/blacklisted OSes in cluster info
  ...

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---

7f0a3ddff058040029ded46c4ad23778e620ba39