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

Merge remote branch 'origin/devel-2.1' 


* origin/devel-2.1:
  Rightname confd's HMAC key
  Rename SSL_CERT_FILE to NODED_CERT_FILE
  Clarify the error message for ':' in PV names

Conflicts:
	lib/bootstrap.py: Trivial
	lib/constants.py: Trivial

Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parents b701a5df 6b7d5878
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 61 additions and 57 deletions
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