Merge branch 'stable-2.6-hotplug' into stable-2.6-ippool-hotplug-esi (2081f0bd) · 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

2081f0bd

Commit 2081f0bd authored 12 years ago by Dimitris Aragiorgis

Downloads
- Plain Diff

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


Conflicts:
	lib/config.py

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

parents 1b2ebbc0 c1bfc2eb

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

lib/cmdlib.py 27 additions, 16 deletions

lib/cmdlib.py
lib/config.py 7 additions, 7 deletions

lib/config.py

with 34 additions and 23 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