Skip to content
Snippets Groups Projects
Commit 54dc4fdb authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Merge remote branch 'origin/devel-2.1' 


* origin/devel-2.1:
  RAPI client: Implement old instance creation request format
  rlib2: Use constants for disk and NIC parameters

Conflicts:
	test/ganeti.rapi.client_unittest.py: Trivial
	test/ganeti.rapi.rlib2_unittest.py: Trivial

Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents 926feaf1 48436b97
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment