Merge branch 'devel-2.5'
authorMichael Hanselmann <hansmi@google.com>
Wed, 12 Oct 2011 11:39:10 +0000 (13:39 +0200)
committerMichael Hanselmann <hansmi@google.com>
Wed, 12 Oct 2011 11:51:22 +0000 (13:51 +0200)
commit009763045bcdc82d2ddeb9c9cf0716424050ba9c
tree84483c10a6198fb143aae97b901a791759e6f311
parent727274dd996127dfd2743de34d551737f0e676f9
parent5b0ac1a52a0b436b349cc7c1ffa26e4c8917020a
Merge branch 'devel-2.5'

* devel-2.5:
  rpc: Disable HTTP client pool and reduce memory consumption
  Preserve bridge MTU in KVM ifup script
  hail: Fix result for node evacuation
  Fix assertion error on unclean master shutdown

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
htools/Ganeti/HTools/Cluster.hs
lib/rpc.py