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

Merge remote branch 'origin/devel-2.1'


* origin/devel-2.1:
  Explicitely return None from IgnoreSignals
  AsyncUDPSocket: fix IgnoreSignals usage and test
  Add KVM chroot feature
  Fix and Improve TryToRoman unittest

Conflicts:
	test/ganeti.daemon_unittest.py
	  - trivial

Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents a01b500b 2fd7f564
No related branches found
No related tags found
No related merge requests found
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