Revision 824d0391
ID | 824d0391531231ebe926aa176687c43e7868d967 |
Merge branch 'master-hotplug' into master-ippool-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>
Files
- added
- modified
- copied
- renamed
- deleted