Merge commit 'origin/next' into branch-2.1 (25f9901f) · 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

25f9901f

Commit 25f9901f authored 15 years ago by Iustin Pop

Downloads
- Plain Diff

Merge commit 'origin/next' into branch-2.1

Conflicts:
	lib/cli.py: trivial extra empty line

parents 6839a874 b8f31860

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

lib/cli.py 0 additions, 1 deletion

lib/cli.py
lib/constants.py 6 additions, 0 deletions

lib/constants.py
lib/jqueue.py 44 additions, 9 deletions

lib/jqueue.py
lib/rpc.py 2 additions, 2 deletions

lib/rpc.py
scripts/gnt-debug 5 additions, 10 deletions

scripts/gnt-debug

with 57 additions and 22 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