Revision 54dc4fdb
| ID | 54dc4fdb89d9c432c52cdc9904a25f98b36e3e9b |
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: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Files
- added
- modified
- copied
- renamed
- deleted