Merge branch 'devel-2.6'
* devel-2.6: verify-disks: Explicitely state nothing has to be done Add list of design documents implemented in version 2.6 Better list of replace-disks arguments + typos fixed jqueue: Look at archived jobs when watching Show old primary/secondary node on disk replacement gnt-instance reinstall: Don't always exit with success LUClusterVerify: Ignore /proc/drbd if DRBD is disabled Fixed typos in devnotes.rst Always_failover doesn't require --allow-failover anymore bash_completion: Enable extglob while parsing file rpc: Remove duplicated logic, fix unittests Annotate disk params on instance_start cmdlib: Handle locking.ALL_SET correctly when copying locks Conflicts: Makefile.am: Sorted file lists autotools/build-bash-completion: Compact output lib/rpc_defs.py: instance_start changed on both sides qa/qa_instance.py: Modified on both sides test/ganeti.cmdlib_unittest.py: Tests added on both sides Signed-off-by:Michael Hanselmann <hansmi@google.com> Reviewed-by:
Iustin Pop <iustin@google.com>
Showing
- Makefile.am 1 addition, 0 deletionsMakefile.am
- autotools/build-bash-completion 5 additions, 0 deletionsautotools/build-bash-completion
- doc/design-2.6.rst 14 additions, 0 deletionsdoc/design-2.6.rst
- doc/design-draft.rst 0 additions, 2 deletionsdoc/design-draft.rst
- doc/devnotes.rst 2 additions, 2 deletionsdoc/devnotes.rst
- doc/index.rst 3 additions, 0 deletionsdoc/index.rst
- lib/client/gnt_cluster.py 2 additions, 0 deletionslib/client/gnt_cluster.py
- lib/client/gnt_instance.py 8 additions, 4 deletionslib/client/gnt_instance.py
- lib/cmdlib.py 25 additions, 9 deletionslib/cmdlib.py
- lib/rpc.py 4 additions, 5 deletionslib/rpc.py
- lib/rpc_defs.py 2 additions, 2 deletionslib/rpc_defs.py
- man/gnt-instance.rst 7 additions, 7 deletionsman/gnt-instance.rst
- man/gnt-node.rst 4 additions, 4 deletionsman/gnt-node.rst
- man/hspace.rst 1 addition, 1 deletionman/hspace.rst
- qa/qa_instance.py 25 additions, 0 deletionsqa/qa_instance.py
- test/ganeti.cmdlib_unittest.py 13 additions, 0 deletionstest/ganeti.cmdlib_unittest.py
- test/ganeti.rpc_unittest.py 22 additions, 3 deletionstest/ganeti.rpc_unittest.py
Loading
Please register or sign in to comment