Revision d393737d
ID | d393737dd8d4bbc98fb94f6e126962f6aa3a2fc8 |
Parent | f4a2f532, 48c8887b |
Child | 541822e0 |
Merge branch 'next' into branch-2.1
- next:
Remove SimpleConfigWriter.SetMasterNode
_GenerateDiskTemplate: use base_index in the name
ganeti-masterd: avoid SimpleConfigReader
cmdlib: Fix typo in LUQueryClusterInfo
Conflicts:
daemons/ganeti-masterd
RPC related conflict
Signed-off-by: Guido Trotter <ultrotter@google.com>
Files
- added
- modified
- copied
- renamed
- deleted