« Previous | Next » 

Revision 6aac5aef

ID6aac5aef5c2fc043b8522133f945dcf577aca2aa
Parent 235407ba, 8ac5c5d7
Child c711d09e

Added by Iustin Pop over 10 years ago

Merge remote branch 'origin/devel-2.4'

  • origin/devel-2.4:
    Fix errors in hooks documentation
    Clarify a bit the noded man page
    Note --no-remember in NEWS
    Switch QA over to using instance stop --no-remember
    Implement no_remember at RAPI level
    Implement no_remember at CLI level
    Introduce instance start/stop no_remember attribute
    Bump version for the 2.4.2 release
    Fix a bug in LUInstanceMove
    Abstract ignore_consistency opcode parameter
    Preload the string-escape code in noded
    Fix error in iallocator documentation reg. disk mode
    Try to prevent instance memory changes N+1 failures
    Update NEWS file for the 2.4.2 release

Conflicts:
NEWS (trivial)
doc/iallocator.rst (kept our version)
lib/cli.py (trivial)
lib/opcodes.py (removed duplicated work, both branches
introduced the same new variable
PIgnoreConsistency :)
lib/rapi/client.py (trivial)
lib/rapi/rlib2.py (almost trivial)
qa/ganeti-qa.py (below trivial)

Signed-off-by: Iustin Pop <>
Reviewed-by: Guido Trotter <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted