Merge branch 'stable-2.6' into devel-2.6
authorMichael Hanselmann <hansmi@google.com>
Thu, 11 Oct 2012 09:16:29 +0000 (11:16 +0200)
committerMichael Hanselmann <hansmi@google.com>
Thu, 11 Oct 2012 09:24:47 +0000 (11:24 +0200)
commitc44356fd7076479cbc6504124763a561a3a8d657
treee0b58d7f5fc2a7d99b1bcaace75aed21a89b9571
parent99c7795a3e2dc75b9d8e3ce73bb032c2e99132ec
parent9b99be280663a7281f6269ece7ba2f31add385ef
Merge branch 'stable-2.6' into devel-2.6

* stable-2.6:
  verify-disks: Explicitely state nothing has to be done
  Add list of design documents implemented in version 2.6
  Better list of replace-disks arguments + typos fixed
  jqueue: Look at archived jobs when watching
  Show old primary/secondary node on disk replacement
  gnt-instance reinstall: Don't always exit with success
  LUClusterVerify: Ignore /proc/drbd if DRBD is disabled
  Fixed typos in devnotes.rst
  Always_failover doesn't require --allow-failover anymore
  bash_completion: Enable extglob while parsing file
  rpc: Remove duplicated logic, fix unittests
  Annotate disk params on instance_start
  cmdlib: Handle locking.ALL_SET correctly when copying locks

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Makefile.am
doc/design-draft.rst
lib/cmdlib.py