projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1ec869 58f6738)
Merge branch 'stable-2.5' into devel-2.5
authorMichael Hanselmann <hansmi@google.com>
Wed, 12 Oct 2011 11:03:15 +0000 (13:03 +0200)
committerMichael Hanselmann <hansmi@google.com>
Wed, 12 Oct 2011 11:35:51 +0000 (13:35 +0200)
* stable-2.5:
  rpc: Disable HTTP client pool and reduce memory consumption
  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>

1  2 
htools/Ganeti/HTools/Cluster.hs patch | diff1 | diff2 | blob | history
lib/rpc.py patch | diff1 | diff2 | blob | history

diff --cc htools/Ganeti/HTools/Cluster.hs
Simple merge
diff --cc lib/rpc.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.