Merge branch 'stable-hotplug'
authorDimitris Aragiorgis <dimara@grnet.gr>
Wed, 22 Aug 2012 14:22:14 +0000 (17:22 +0300)
committerDimitris Aragiorgis <dimara@grnet.gr>
Wed, 22 Aug 2012 14:22:14 +0000 (17:22 +0300)
commita5e58089f9730c4d93b38f1071170bc792f25ee4
tree250b772fe26bb70a198294e9040ce440ef297c6b
parenta8740a258e85e44a6c01a7d272a72d903120ed9d
parent50fab955aea8fe8605a4606644c7f27faa561e0c
Merge branch 'stable-hotplug'

Conflicts:
lib/cli.py
lib/client/gnt_instance.py
lib/cmdlib.py
lib/objects.py
lib/opcodes.py
lib/rpc.py

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>
lib/backend.py
lib/cli.py
lib/client/gnt_instance.py
lib/cmdlib.py
lib/config.py
lib/hypervisor/hv_kvm.py
lib/objects.py
lib/opcodes.py