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 <iustin@google.com> Reviewed-by:
Guido Trotter <ultrotter@google.com>
Showing
- NEWS 87 additions, 0 deletionsNEWS
- configure.ac 1 addition, 1 deletionconfigure.ac
- doc/hooks.rst 9 additions, 9 deletionsdoc/hooks.rst
- lib/cli.py 7 additions, 0 deletionslib/cli.py
- lib/client/gnt_instance.py 10 additions, 6 deletionslib/client/gnt_instance.py
- lib/cmdlib.py 17 additions, 12 deletionslib/cmdlib.py
- lib/opcodes.py 7 additions, 0 deletionslib/opcodes.py
- lib/rapi/client.py 10 additions, 2 deletionslib/rapi/client.py
- lib/rapi/rlib2.py 7 additions, 3 deletionslib/rapi/rlib2.py
- lib/server/noded.py 8 additions, 0 deletionslib/server/noded.py
- man/ganeti-noded.rst 2 additions, 2 deletionsman/ganeti-noded.rst
- man/gnt-instance.rst 23 additions, 3 deletionsman/gnt-instance.rst
- qa/ganeti-qa.py 4 additions, 4 deletionsqa/ganeti-qa.py
- qa/qa_daemon.py 20 additions, 25 deletionsqa/qa_daemon.py
Loading
Please register or sign in to comment