« Previous | Next » 

Revision 824d0391

ID824d0391531231ebe926aa176687c43e7868d967

Added by Dimitris Aragiorgis over 11 years ago

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 <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted