BIND 10 master, updated. fc9c42d22de8c2c5555573a1a3e29b2d30146a29 Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  fc9c42d22de8c2c5555573a1a3e29b2d30146a29 (commit)
       via  3303478b6f9943fd5514268bb1c0c42a638d107a (commit)
      from  d158640b970e5d8f0e5d4f8c6c278f03ee0e47e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fc9c42d22de8c2c5555573a1a3e29b2d30146a29
Merge: 3303478b6f9943fd5514268bb1c0c42a638d107a d158640b970e5d8f0e5d4f8c6c278f03ee0e47e7
Author: Shane Kerr <shane at isc.org>
Date:   Tue May 17 11:43:43 2011 +0200

    Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

commit 3303478b6f9943fd5514268bb1c0c42a638d107a
Author: Shane Kerr <shane at isc.org>
Date:   Tue May 17 11:43:10 2011 +0200

    Use os._exit() when exiting from a forked() child process, not sys.exit()

-----------------------------------------------------------------------

Summary of changes:
 src/bin/msgq/tests/msgq_test.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/msgq/tests/msgq_test.py b/src/bin/msgq/tests/msgq_test.py
index 26878f7..fe4f7d4 100644
--- a/src/bin/msgq/tests/msgq_test.py
+++ b/src/bin/msgq/tests/msgq_test.py
@@ -202,7 +202,7 @@ class SendNonblock(unittest.TestCase):
                 try:
                     def killall(signum, frame):
                         os.kill(queue_pid, signal.SIGTERM)
-                        sys.exit(1)
+                        os._exit(1)
                     signal.signal(signal.SIGALRM, killall)
                     msg = msgq.preparemsg({"type" : "ping"}, data)
                     now = time.clock()