Merge branch 'devel-2.2' into devel-2.3
authorIustin Pop <iustin@google.com>
Fri, 4 Mar 2011 11:36:15 +0000 (12:36 +0100)
committerIustin Pop <iustin@google.com>
Mon, 7 Mar 2011 08:59:10 +0000 (09:59 +0100)
* devel-2.2:
  Fix LUClusterRepairDiskSizes and rpc result usage
  Fix RPC mismatch in blockdev_getsize[s]

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: RenĂ© Nussbaumer <rn@google.com>

1  2 
lib/cmdlib.py
lib/rpc.py

diff --cc lib/cmdlib.py
Simple merge
diff --cc lib/rpc.py
Simple merge