Skip to content
Snippets Groups Projects
Commit 6a74f584 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

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: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents 43d51ef2 c44356fd
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment