Merge branch 'stable-2.6' into stable-2.6-ippool-hotplug-esi
Conflicts:
lib/cmdlib.py
Signed-off-by: 
Dimitris Aragiorgis <dimara@grnet.gr>
No related branches found
No related tags found
Showing
- doc/devnotes.rst 7 additions, 0 deletionsdoc/devnotes.rst
- lib/client/gnt_cluster.py 6 additions, 2 deletionslib/client/gnt_cluster.py
- lib/client/gnt_debug.py 2 additions, 2 deletionslib/client/gnt_debug.py
- lib/client/gnt_instance.py 3 additions, 1 deletionlib/client/gnt_instance.py
- lib/cmdlib.py 50 additions, 40 deletionslib/cmdlib.py
- lib/jqueue.py 53 additions, 4 deletionslib/jqueue.py
- lib/mcpu.py 6 additions, 4 deletionslib/mcpu.py
- lib/opcodes.py 1 addition, 1 deletionlib/opcodes.py
- lib/server/masterd.py 21 additions, 4 deletionslib/server/masterd.py
- man/gnt-cluster.rst 6 additions, 1 deletionman/gnt-cluster.rst
- man/gnt-instance.rst 1 addition, 1 deletionman/gnt-instance.rst
- test/ganeti.jqueue_unittest.py 223 additions, 3 deletionstest/ganeti.jqueue_unittest.py
- tools/kvm-ifup.in 8 additions, 2 deletionstools/kvm-ifup.in
Loading
Please register or sign in to comment