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

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


* origin/devel-2.0:
  Fix two potentially endless loops in http library
  Update NEWS file and bump version to 2.0.6
  ganeti-cleaner: does 'echo 0' instead of 'exit 0'

Conflicts:
	NEWS: Trivial
	configure.ac: Trivial

Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents 2826b361 0be13136
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment