commit 33d383c3e262d1e363cc92ac8c040e8b883b1beb Merge: 6b99785 c47478f Author: Iustin Pop <[email protected]> Date: Mon Jun 14 20:11:38 2010 +0200
Merge branch 'devel-2.1' into master
No conflicts, the output was:
Merge made by recursive.
lib/backend.py | 2 +-
lib/cmdlib.py | 29 ++++++++++++++++++-----------
lib/constants.py | 12 ++++++++++++
lib/hypervisor/hv_fake.py | 2 +-
lib/rpc.py | 2 +-
5 files changed, 33 insertions(+), 14 deletions(-)
--
iustin
