Merge branch 'stable-2.6' into devel-2.6
authorIustin Pop <iustin@google.com>
Fri, 21 Dec 2012 17:50:21 +0000 (18:50 +0100)
committerIustin Pop <iustin@google.com>
Fri, 21 Dec 2012 18:42:56 +0000 (19:42 +0100)
commit478a3308e293f04319414ce0f2cbadb0bf6b9a16
treee3a985837b2fc9a082df755b9a350e50892fa33e
parent6cbf6d9a228179582f3832bf24730c02c42322d6
parentefe2137acb33d6792a2e843a69b6aed4803f6ceb
Merge branch 'stable-2.6' into devel-2.6

No conflicts, really trivial.

* stable-2.6:
  Final update of NEWS file for 2.6.2 and version bump
  Fix job completion with big job queues
  confd: reduce noise during normal config reload
  Change hbal handling of !auto_balance instances
  Small corrections in man pages
  Fix gnt-instance(8) w.r.t. growable disk templates
  Stop verifying opcode results in dry_run mode
  Update NEWS for 2.6.2
  Fix TypeError when unsetting OS parameters
  cmdlib.py: don't use GetHypervisor

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
lib/cmdlib.py