« Previous | Next » 

Revision fb87cbeb

IDfb87cbebd6984851d609ec5a73b5bac81c222d86
Child 7f0a3ddf

Added by Michael Hanselmann over 11 years ago

Merge branch 'devel-2.3' into devel-2.4

  • devel-2.3:
    Wait for master to become available on initialization
    Start all daemons on cluster initialization
    Clarify job processing order in admin guide
    Improve option descriptions
    Remove two unused variables
    Fix LUOSDiagnose and non-vm_capable nodes
    Rephrasing two error messages for auto promotion
    storage: Check that mapper is either used or None
    Fix bug in “gnt-node list-storage”
    Improve import/export timeout settings
    Increase remote import/export timeout

Conflicts:
lib/constants.py: Trivial
lib/objects.py: Trivial
qa/qa_node.py: Trivial

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted