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

Merge branch 'devel-2.1' into devel-2.2 


* devel-2.1:
  Don't ignore secondary node silently

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