Merge branch 'stable-2.6' into stable-2.6-ippool-hotplug-esi (268dca3a) · Commits · itminedu / snf-ganeti · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

snf-ganeti
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

268dca3a

Commit 268dca3a authored 12 years ago by Dimitris Aragiorgis

Downloads
- Plain Diff

Merge branch 'stable-2.6' into stable-2.6-ippool-hotplug-esi


Conflicts:
	lib/cmdlib.py

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>

parents 04da9087 88f622e0

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

doc/devnotes.rst 7 additions, 0 deletions

doc/devnotes.rst
lib/client/gnt_cluster.py 6 additions, 2 deletions

lib/client/gnt_cluster.py
lib/client/gnt_debug.py 2 additions, 2 deletions

lib/client/gnt_debug.py
lib/client/gnt_instance.py 3 additions, 1 deletion

lib/client/gnt_instance.py
lib/cmdlib.py 50 additions, 40 deletions

lib/cmdlib.py
lib/jqueue.py 53 additions, 4 deletions

lib/jqueue.py
lib/mcpu.py 6 additions, 4 deletions

lib/mcpu.py
lib/opcodes.py 1 addition, 1 deletion

lib/opcodes.py
lib/server/masterd.py 21 additions, 4 deletions

lib/server/masterd.py
man/gnt-cluster.rst 6 additions, 1 deletion

man/gnt-cluster.rst
man/gnt-instance.rst 1 addition, 1 deletion

man/gnt-instance.rst
test/ganeti.jqueue_unittest.py 223 additions, 3 deletions

test/ganeti.jqueue_unittest.py
tools/kvm-ifup.in 8 additions, 2 deletions

tools/kvm-ifup.in

with 387 additions and 65 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment