Merge remote branch 'google/stable-2.6' into stable-2.6-ippool-hotplug-esi (e43e78df) · 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

e43e78df

Commit e43e78df authored 12 years ago by Dimitris Aragiorgis

Downloads
- Plain Diff

Merge remote branch 'google/stable-2.6' into stable-2.6-ippool-hotplug-esi


Conflicts:
	lib/rpc.py

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

parents fe48d53c 0e2b7c58

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

Makefile.am 9 additions, 1 deletion

Makefile.am
htools/Ganeti/HTools/Cluster.hs 1 addition, 1 deletion

htools/Ganeti/HTools/Cluster.hs
lib/client/gnt_debug.py 4 additions, 1 deletion

lib/client/gnt_debug.py
lib/cmdlib.py 22 additions, 10 deletions

lib/cmdlib.py
lib/netutils.py 5 additions, 5 deletions

lib/netutils.py
lib/opcodes.py 1 addition, 0 deletions

lib/opcodes.py
lib/rpc.py 4 additions, 5 deletions

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

lib/rpc_defs.py
lib/watcher/__init__.py 2 additions, 1 deletion

lib/watcher/__init__.py
qa/ganeti-qa.py 3 additions, 2 deletions

qa/ganeti-qa.py
qa/qa_config.py 3 additions, 3 deletions

qa/qa_config.py
test/ganeti.cmdlib_unittest.py 13 additions, 0 deletions

test/ganeti.cmdlib_unittest.py
test/ganeti.rpc_unittest.py 22 additions, 3 deletions

test/ganeti.rpc_unittest.py
tools/move-instance 3 additions, 2 deletions

tools/move-instance

with 94 additions and 36 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