projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ab94e4 0592799)
Merge branch 'devel-2.4' into stable-2.5
authorMichael Hanselmann <hansmi@google.com>
Wed, 12 Oct 2011 11:00:19 +0000 (13:00 +0200)
committerMichael Hanselmann <hansmi@google.com>
Wed, 12 Oct 2011 11:01:16 +0000 (13:01 +0200)
* devel-2.4:
  rpc: Disable HTTP client pool and reduce memory consumption
  Fix assertion error on unclean master shutdown

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

1  2 
lib/rpc.py patch | diff1 | diff2 | blob | history

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