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

Merge remote branch 'origin/stable-2.1' into devel-2.1 

* origin/stable-2.1:
  Bump version to 2.1.0~rc5
  Fix missing bridge for xen instances
  Fix flipping MC flag bug
  ganeti-watcher: ensure confd is running as well
parents eb732fb5 8432c491
No related branches found
No related tags found
No related merge requests 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