Skip to content
Snippets Groups Projects
Commit fba15943 authored by Guido Trotter's avatar Guido Trotter
Browse files

Merge branch 'master' into next 

* master:
  Create a new --no-voting option for masterfailover
  ganeti-masterd: allow non-interactive --no-voting
parents 7c4d6c7b 8e2524c3
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment