BIND 10 trac496, created. 8909387beb99136bc5ec22574515c84e8ef526da Merge branch 'master' of git+ssh://bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, trac496 has been created
        at  8909387beb99136bc5ec22574515c84e8ef526da (commit)

- Log -----------------------------------------------------------------
commit 8909387beb99136bc5ec22574515c84e8ef526da
Merge: 952124e0f4d2b64d8b3a47b52163edca7c3546ab 73a679d7b03fc3c53fb4826a95ee099321fb4c4d
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Fri Jan 28 09:10:13 2011 +0100

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

commit 952124e0f4d2b64d8b3a47b52163edca7c3546ab
Merge: c5d416a01e152b936c0023fcc65d3d468250388b af4b23610ff5cb55748737dff2b67c4f905b2480
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Fri Jan 28 08:57:51 2011 +0100

    Merge remote-tracking branch 'origin/trac526'
    
    Conflicts:
    	src/bin/auth/query.cc

commit 73a679d7b03fc3c53fb4826a95ee099321fb4c4d
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Jan 27 14:19:12 2011 -0800

    [master] fixed another regression: removed an unnecessary parameter
    in a function call that triggered typeerror exception.
    okayed on jabber.

commit af4b23610ff5cb55748737dff2b67c4f905b2480
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Jan 27 10:34:05 2011 -0800

    [trac526] added tests for explicit type CNAME queries.  added notes about
    points to be considered with chaining.

commit c5d416a01e152b936c0023fcc65d3d468250388b
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Jan 27 13:54:16 2011 +0100

    fix timeout tests
    
    The tests worked, but the timeouts were so small that on somewhat slower
    systems the tests could fail. Increased them a bit.

commit d6113a313ff848124a3ecd2e58b17bb04b5bcbee
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Jan 27 12:39:19 2011 +0100

    update changelog

commit 578ea7f4ba94dc0d8a3d39231dad2be118e125a2
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Jan 27 12:35:45 2011 +0100

    Cleaned up merge conflict issues
    
    In the previous commit I resolved a few merge conflicts, but too
    hastily, this fixes 'em good

commit 1dbc33e995c77185505e91387359f0f4ff7adadd
Merge: 5720ab60da4b443e9414852234d65acccd8e9e4e 6e9d5c8b61fff0b1f2a1dfb9d685bbd6ce090e8a
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Jan 27 11:48:49 2011 +0100

    Merge remote branch 'origin/trac489'
    
    Conflicts:
    	src/bin/resolver/resolver.cc
    	src/lib/asiolink/asiolink.cc
    	src/lib/asiolink/asiolink.h
    	src/lib/asiolink/tests/asiolink_unittest.cc

commit 661ee8d341d0a24b6cab13302b028a9efb40daa4
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Jan 27 11:09:49 2011 +0100

    [trac526] More CNAME tests
    
    They are almost the same right now, but they will be different once the
    CNAME chaining is implemented.

commit 1dd7c3d6806b8694fa315f55c105884245e486ea
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Jan 27 10:47:10 2011 +0100

    [trac526] Cosmetic comment fix

commit 94b0beeb606dedc3c8fc44856e0a6f2d3c9754b4
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Jan 26 13:43:28 2011 +0100

    [trac526] Implement returning CNAME
    
    No chaining is implemented. While RFC 1024 indicates we should do it at
    last inside the same zone, we don't now and leave it out for later.
    
    The CNAME is handled in the same way as as SUCCESS with slight
    modification about additional data (which probably never happen in real
    life anyway).

commit 424bb3df5cd1e1cf8b64f76ff5f0118da05de9e6
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Jan 26 13:16:13 2011 +0100

    [trac526] Test for CNAME
    
    No chaining yet.

commit 6e9d5c8b61fff0b1f2a1dfb9d685bbd6ce090e8a
Author: Jelte Jansen <jelte at isc.org>
Date:   Tue Jan 25 10:21:16 2011 +0100

    expect_eq(bool -> expect_true/false

commit 8f23ba4a72eed354852b023a4d41adfe4a62bb0c
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Jan 21 16:45:47 2011 +0100

    use the three types of timeout
    
    Note that client_timeout at this point has the same result as
    lookup_timeout.
    
    Changed self-deletion of RunningQuery a bit, as it
    cannot delete itselfs until we are sure there are not events coming in
    anymore. If we change the clientTimeout() callback to send an answer and
    not stop, we shall need to keep track of that fact (i.e. not send back
    an answer in the end, and update stop since it won't be called by
    clientTimeout() anymore
    
    When adding the asiolink tests for these features, added a few
    convenience functions for common code in those tests.

commit b3ec8dc3523bf2573cdc33a73eb21605d8a32305
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Jan 21 11:29:30 2011 +0100

    enable configuration of new timeouts
    
    renamed existing timeout to query_timeout, added client_timeout and
    lookup_timeout
    In the config spec, these are named timeout_XX instead of XX_timeout, so
    they will automatically be shown next to each other in ordered output

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