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

Merge remote branch 'origin/devel-2.1'


* origin/devel-2.1: (116 commits)
  Implement replacing cluster certs and keys via “gnt-cluster renew-crypto”
  cli: Add helper function to stop and start whole cluster
  cfgupgrade: Use new bootstrap function for certs and keys
  bootstrap: Add new function to create cluster certs and keys
  utils.CreateBackup: Use human-readable instead of seconds since Epoch
  Add unittest for daemon-util
  Add support for non-Python unittests
  daemon-util: Generate daemon path in separate function
  daemon-util: Use “return” instead of “exit” in all functions
  daemon-util: Add function to start and stop all daemons
  ganeti.initd: Move all daemon names from init script to daemon-util
  ganeti.initd: Move code checking daemon exit code to daemon-util
  ganeti.initd: Move code checking config to daemon-util
  daemon-util: Require dashes in commands
  Improve ganeti.serializer unittests
  Add unittests for ganeti.errors
  Verify cluster certificates in LUVerifyCluster
  utils: Add function to extract X509 cert validity
  Add constant with cluster X509 certificates
  Release version 2.1.1
  ...

Conflicts:
	lib/backend.py: Trivial
	lib/bootstrap.py: Trivial
	lib/constants.py: Trivial
	lib/http/server.py: Trivial
	lib/utils.py: RunCmd parameter “reset_env”
	test/ganeti.utils_unittest.py: Trivial
	tools/cfgupgrade: Trivial

Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parents f0476905 6d4a1656
No related branches found
No related tags found
No related merge requests found
Showing with 689 additions and 236 deletions
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