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:Guido Trotter <ultrotter@google.com> Reviewed-by:
Michael Hanselmann <hansmi@google.com>
No related branches found
No related tags found
Showing
- lib/daemon.py 6 additions, 4 deletionslib/daemon.py
- lib/utils.py 6 additions, 2 deletionslib/utils.py
- man/gnt-instance.sgml 17 additions, 0 deletionsman/gnt-instance.sgml
- test/ganeti.compat_unittest.py 23 additions, 3 deletionstest/ganeti.compat_unittest.py
- test/ganeti.daemon_unittest.py 16 additions, 0 deletionstest/ganeti.daemon_unittest.py
Loading
Please register or sign in to comment