Skip to content
Snippets Groups Projects
Commit ef7b75b2 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:
  Fix bug introduced in commit 413b7472
  Fix locking bug causing high CPU usage
  Fix confd procotol design description
  Implement instance rename QA tests
  Fix "gnt-instance rename" functionality

Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parents fabee4b2 b44b0141
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