Merge branch 'devel-2.7'
* devel-2.7: (23 commits) Add export lists for files which didn't have them Fix Haskell compatibility tests with disabled file storage Fix QA with disabled file storage Fix convert-constants handling of booleans Fix handling of disabled (shared) file storage Fix low verbosity levels in htools Fix improperly formatted docstring Allow iallocator to work without LVM storage Allow rpc.MakeLegacyNodeInfo to parse non-LVM results Fix LUTestAllocator with instance alloc Fix confd issue regarding --no-lvm-storage Fix networks in _PrepareNicModifications() Fix sphinx label namespace Clarify use of move-instance with self-signed certificates Remove early returns in network LUs Fix HooksDict() in case of no tags Add networks to _AllIDs() Fix locking in LUNetworkConnect() Fix networks in LUInstanceSetParams() Fix another docstring typo ... Conflicts: src/Ganeti/Query/Node.hs (trivial; function rename in master and 'vgs' change in devel-2.7) also exported new entity from TestCommon.hs (used in master) Signed-off-by:Iustin Pop <iustin@google.com> Reviewed-by:
Helga Velroyen <helgav@google.com>
No related branches found
No related tags found
Showing
- autotools/check-news 11 additions, 1 deletionautotools/check-news
- autotools/convert-constants 3 additions, 1 deletionautotools/convert-constants
- doc/move-instance.rst 26 additions, 3 deletionsdoc/move-instance.rst
- lib/bdev.py 2 additions, 2 deletionslib/bdev.py
- lib/cmdlib.py 62 additions, 46 deletionslib/cmdlib.py
- lib/config.py 1 addition, 0 deletionslib/config.py
- lib/masterd/iallocator.py 35 additions, 15 deletionslib/masterd/iallocator.py
- lib/objects.py 1 addition, 1 deletionlib/objects.py
- lib/pathutils.py 10 additions, 4 deletionslib/pathutils.py
- lib/rpc.py 13 additions, 6 deletionslib/rpc.py
- qa/qa_node.py 12 additions, 2 deletionsqa/qa_node.py
- src/Ganeti/HTools/Program/Hbal.hs 2 additions, 2 deletionssrc/Ganeti/HTools/Program/Hbal.hs
- src/Ganeti/HTools/Program/Hcheck.hs 3 additions, 3 deletionssrc/Ganeti/HTools/Program/Hcheck.hs
- src/Ganeti/Objects.hs 2 additions, 1 deletionsrc/Ganeti/Objects.hs
- src/Ganeti/Query/Node.hs 3 additions, 2 deletionssrc/Ganeti/Query/Node.hs
- src/Ganeti/Query/Server.hs 2 additions, 1 deletionsrc/Ganeti/Query/Server.hs
- test/hs/Test/Ganeti/HTools/Types.hs 2 additions, 6 deletionstest/hs/Test/Ganeti/HTools/Types.hs
- test/hs/Test/Ganeti/TestCommon.hs 37 additions, 1 deletiontest/hs/Test/Ganeti/TestCommon.hs
- test/hs/Test/Ganeti/TestHTools.hs 13 additions, 2 deletionstest/hs/Test/Ganeti/TestHTools.hs
- test/hs/Test/Ganeti/Types.hs 30 additions, 3 deletionstest/hs/Test/Ganeti/Types.hs
Loading
Please register or sign in to comment