BIND 10 trac491, created. 6c11d9c51b88e2a6d238eac951d1d0317978f636 [master] Resolve conflict in changelog

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Feb 15 11:07:49 UTC 2011 

The branch, trac491 has been created
        at  6c11d9c51b88e2a6d238eac951d1d0317978f636 (commit)

- Log -----------------------------------------------------------------
commit 6c11d9c51b88e2a6d238eac951d1d0317978f636
Merge: cdd18357620129b8533e9619b30b37ecbc91ede0 541478374f183c2742a7f07e6558836a4dd09570
Author: Jelte Jansen <jelte at isc.org>
Date:   Tue Feb 15 11:59:56 2011 +0100

    [master] Resolve conflict in changelog
    
    Conflicts:
    	ChangeLog

commit cdd18357620129b8533e9619b30b37ecbc91ede0
Author: Jelte Jansen <jelte at isc.org>
Date:   Tue Feb 15 11:58:28 2011 +0100

    [master] update Changelog with correct git commit

commit 8aa3b2246ae095bbe7f855fd11656ae3bdb98986
Merge: 756e56a8c683906b1b50bba5675c996fb1295820 adba8b7c9e699cf557646e942012567f8e5156c9
Author: Jelte Jansen <jelte at isc.org>
Date:   Tue Feb 15 11:57:35 2011 +0100

    [master] Merge branch 'trac449'
    
    Conflicts:
    	doc/Doxyfile
    	src/lib/Makefile.am

commit adba8b7c9e699cf557646e942012567f8e5156c9
Author: Jelte Jansen <jelte at isc.org>
Date:   Tue Feb 15 11:22:27 2011 +0100

    [trac449] replaces some tabs with spaces

commit 541478374f183c2742a7f07e6558836a4dd09570
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Feb 15 10:36:03 2011 +0100

    Changelog for #572

commit 17f237478961005707d649a661cc72a4a0d612d4
Merge: dd61821a6c910d90c4a46024e303965048dde0aa 12c23a667c1e9a4b92d1cd8fc07136faf4c41a8a
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Feb 15 10:26:29 2011 +0100

    Merge branch 'work/boss/no-forward'

commit 12c23a667c1e9a4b92d1cd8fc07136faf4c41a8a
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Feb 15 10:22:04 2011 +0100

    [trac572] Variable renaming

commit dd61821a6c910d90c4a46024e303965048dde0aa
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Tue Feb 15 11:16:04 2011 +0900

    [master] Fixed failure of termination of msgq_test.py with python3 coverage(3.3.1)

commit 0e6a18e12f61cc482e07078776234f32605312e5
Merge: 756e56a8c683906b1b50bba5675c996fb1295820 1708a52ea3956e0e7027991f6cfeb6a1b9415b94
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Tue Feb 15 11:13:10 2011 +0900

    Merge branch 'trac573'

commit 756e56a8c683906b1b50bba5675c996fb1295820
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Feb 14 21:41:07 2011 +0100

    [master] fix sunstudio build and distcheck
    
    forgot an EXTRA_DIST for the distcheck, and sunstudio needs unistd to be included before asio.hpp

commit 1708a52ea3956e0e7027991f6cfeb6a1b9415b94
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Thu Feb 3 20:40:51 2011 +0900

    [trac573] change in grammar

commit 47e53343554aa6b4323ab05799a6315fb1e42538
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Thu Feb 3 20:40:51 2011 +0900

    [trac573] Fixed failure of termination of msgq_test.py in python3 coverage(3.3.1)

commit 0ae5d2d73aad78ee24e641870cec1ab06f65e3f6
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Feb 14 10:50:31 2011 +0100

    [trac449] second round of review comments

commit 411b0f674614000d1f4606e0c225d078c1981628
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Sun Feb 13 12:10:58 2011 +0100

    [trac572] Remove Boss's -f

commit a02e4f3441285f10958b72e2337aa1b6e290fb56
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Feb 11 11:24:13 2011 +0100

    [trac449] add test to check ttl does not wrap when dropping to 0

commit 16bbee505681b46ef60febb8067765704afdeb24
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Feb 11 11:01:37 2011 +0100

    [trac449] moved private: around a bit

commit 1b4b8193675f0ebc9b63480900257fa21e5cfa72
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Feb 10 17:51:34 2011 +0100

    [trac449] added ResolverClassCache class
    
    ResolverCache now uses that to handle different subcaches for classes
    more efficiently (there is more room for improvement, noted as TODOs)
    Currently reasides in the same .h and .cc files. Still contemplating
    whether this should be hidden completely, or moved to its own files

commit 214eb805737eed8035490dc8ada790bca5c14fb6
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Feb 10 15:48:39 2011 +0100

    [trac449] Addressed most review comments
    
    all of them, except the class issue in ResolverCache

commit 42e9021df5556117697f9228645a4ff3eee246ae
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Feb 10 10:19:54 2011 +0100

    [trac449] Update doxygen parameters and descriptions

commit 26ab69e18bd0417086315c20192b8b93093bf6e3
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Feb 9 15:31:13 2011 +0100

    [trac449] Parenthesize return statements

commit c1dd1aeae9aa2cb06b372d2002fa15d57aa7c552
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Wed Jan 26 19:05:56 2011 +0800

    [trac449] Add two TODO list items.

commit a8746fb17e10db78330cf69b2850515020f5cd56
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Tue Jan 25 11:52:17 2011 +0800

    Commit all left commit changes

commit 42dbc3cabef1db3f4c9ce99bc0830ce34794a704
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Sun Jan 23 17:05:19 2011 +0800

    Rename recursor to resolver

commit e7c61f1bb5cf375a1f005bb7d77080d2fcd8fb9e
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Sun Jan 23 16:32:17 2011 +0800

    Commit the latest change

commit ac8359174eaeb1df18bddcb0a57807d49ff8ed53
Merge: c94995ad3292958582d1ad491fdfbaa76e43cad8 3f791c7c437212e55981f044ef722a759f58a184
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Fri Jan 21 15:06:58 2011 +0800

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

commit c94995ad3292958582d1ad491fdfbaa76e43cad8
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Fri Jan 21 15:06:39 2011 +0800

    Add the local zone data class

commit fca9cd2ad55dfdff80ed3106c4cb40bf4d508d26
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Fri Jan 21 15:06:30 2011 +0800

    Add the local zone data class

commit 42beef26ba126bab9740af0a809617fc3c1906c6
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Thu Jan 20 17:22:09 2011 +0800

    commit the lastest change for message entry

commit 3f791c7c437212e55981f044ef722a759f58a184
Author: Ocean Wang <wanghaidong at cnnic.cn>
Date:   Thu Jan 20 13:19:13 2011 +0800

    Add ConstRRsetCachePtr definition

commit e64c9d4107c1d012b68239ecf4d828467f7eb6f7
Author: Ocean Wang <wanghaidong at cnnic.cn>
Date:   Thu Jan 20 12:01:09 2011 +0800

    Add cache library to doxygen files
    Make RRsetCache copy constructor and assignment operator private to make it uncopyable
    Add TODO for rrsig processing

commit ba8595ee4dbcc87deb5aca78359dd7a42e4a6f45
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Wed Jan 19 19:42:59 2011 +0800

    Add  unit test code for message cache/entry.

commit 0162b6441a567a0a687a726f651e23bb754bfd71
Author: Ocean Wang <wanghaidong at cnnic.cn>
Date:   Wed Jan 19 16:12:58 2011 +0800

    Save the RRset Hash Key instead of recalculating it everytime
    Add private copy constructor and assignment operator to make it uncopyable

commit 74266da0141650d6ca337a66f266ba675ad2d357
Author: Ocean Wang <wanghaidong at cnnic.cn>
Date:   Wed Jan 19 10:57:38 2011 +0800

    remove trailing spaces

commit bd58459c94e2074aecb39b02fa47a2b79e48cfb6
Author: Ocean Wang <wanghaidong at cnnic.cn>
Date:   Wed Jan 19 10:39:27 2011 +0800

    remove trailing spaces

commit 238f276c9b5887fcf72e86011e610466ce163f5b
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Wed Jan 12 04:16:05 2011 +0800

    Commit the change for cache unittest.

commit 87c347e04505f141d624eb7be497181a37e346d0
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Wed Jan 12 04:15:08 2011 +0800

    Commit the change for cache unittest.

commit 3a899ef4c5c11d4bdfd9f50ac4aaa1b276060a65
Author: Ocean Wang <wanghaidong at cnnic.cn>
Date:   Fri Jan 7 17:47:48 2011 +0800

    Add RRsetCache unit test

commit a99da0d489fbecc59b6d75a85e71e92ec7d173e3
Author: Ocean Wang <wanghaidong at cnnic.cn>
Date:   Fri Jan 7 16:30:48 2011 +0800

    Finish the RRset_Entry unit test

commit a0e0f22323abff0332ac4dff60300874a3e2f1a0
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Fri Jan 7 14:20:54 2011 +0800

    fix the error when get the rrset count in one section of message.

commit 4205ee154f209d4493e2b7176b53c79d5dbaf193
Author: Ocean Wang <wanghaidong at cnnic.cn>
Date:   Fri Jan 7 11:35:39 2011 +0800

    check whether rrsig is null before put into rrset_entry

commit 6e5884cfb1610b47339be5f2578e8e77840d3095
Merge: 4e8c15eae9ffb0d159f5d9f138455aa0213163fe 83d5d9a0bc2599bd9a643c2c6294f382638486b6
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Fri Jan 7 10:04:37 2011 +0800

    Merge remote branch 'origin/trac449' into trac449

commit 4e8c15eae9ffb0d159f5d9f138455aa0213163fe
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Fri Jan 7 10:03:17 2011 +0800

    commit the forgotten files

commit 83d5d9a0bc2599bd9a643c2c6294f382638486b6
Author: Ocean Wang <wanghaidong at cnnic.cn>
Date:   Fri Jan 7 09:53:51 2011 +0800

    Copy the RRsig record to the RRset cache

commit e75ba8ce2f5b2f9814741d0ea633f3542b458a74
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Fri Jan 7 09:20:57 2011 +0800

    Fix the bug in genCacheEntryKey(), and rename it to genCacheEntryName, add unittest code for message_cache.

commit f62f4f06cf94b4d979e5b036a41c06b4f53e5759
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Thu Jan 6 22:39:53 2011 +0800

    add empty check for shared_ptr and fix the dead while problem.

commit 39158d307dd4b4a74f89bb755d22d1edd3a04d80
Author: Ocean Wang <wanghaidong at cnnic.cn>
Date:   Thu Jan 6 15:37:49 2011 +0800

    Insert RRset data to new created RRset
    Update TTL when client request
    Change genRRset() to getRRset()

commit 777f07c955102aaa875ed2567d788b4103f849e1
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Thu Jan 6 14:19:21 2011 +0800

    some change to the interface

commit 2aff13f019888ae254733f2c16d9a8b995a48318
Author: Ocean Wang <wanghaidong at cnnic.cn>
Date:   Thu Jan 6 14:13:21 2011 +0800

    Finish basic function of rrset_entry

commit 0050a51bfb904132db32a2d4729064d8a35a5332
Author: Ocean Wang <wanghaidong at cnnic.cn>
Date:   Thu Jan 6 11:22:04 2011 +0800

    Make some small modification to rrset_entry

commit 77f677784ed005ff2cf6e5387d837897e3e3bdc4
Author: Likun Zhang <zlkzhy at gmail.com>
Date:   Wed Jan 5 06:55:52 2011 +0000

    Add lru support for message cache.
    
    git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac449@4159 e5f2f494-b856-4b98-b285-d166d9295462

commit 886b10843e5e8fe2fd7b04684a590affe1b812ab
Author: Likun Zhang <zlkzhy at gmail.com>
Date:   Wed Jan 5 03:15:40 2011 +0000

    Add the implementaion for class recursor cache
    
    git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac449@4157 e5f2f494-b856-4b98-b285-d166d9295462

commit 07e20270989ec37e95feb3a01fefeb5b80465bef
Author: Likun Zhang <zlkzhy at gmail.com>
Date:   Tue Jan 4 03:41:14 2011 +0000

    Fix the error caused by last change.
    
    git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac449@4144 e5f2f494-b856-4b98-b285-d166d9295462

commit a7bf808a220742d18fb1868241f1665f745ebdbc
Author: Likun Zhang <zlkzhy at gmail.com>
Date:   Tue Jan 4 03:28:52 2011 +0000

    Fix the error caused by last change.
    
    git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac449@4143 e5f2f494-b856-4b98-b285-d166d9295462

commit 8eafc24514f6d6cc1a8b71bef7358cb9bdff5a8c
Author: Likun Zhang <zlkzhy at gmail.com>
Date:   Tue Jan 4 03:20:38 2011 +0000

    Change the interface of genRRset
    
    git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac449@4142 e5f2f494-b856-4b98-b285-d166d9295462

commit 38e8504574d599e1e6d139ebcfe5f905de678e2d
Author: Likun Zhang <zlkzhy at gmail.com>
Date:   Fri Dec 31 10:58:34 2010 +0000

    Commit the latest code of recursor cache.
    
    git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac449@4111 e5f2f494-b856-4b98-b285-d166d9295462

commit 61e391f3bb0af427263c2374d613af3fd10a5fe4
Author: Likun Zhang <zlkzhy at gmail.com>
Date:   Thu Dec 30 10:47:12 2010 +0000

    Commit the cc file.
    
    git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac449@4099 e5f2f494-b856-4b98-b285-d166d9295462

commit 6c3a274305a7823a4060769ab21d55c5975615d6
Author: Likun Zhang <zlkzhy at gmail.com>
Date:   Thu Dec 30 10:45:37 2010 +0000

    Commit the latest change for recursor cache.
    
    git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac449@4098 e5f2f494-b856-4b98-b285-d166d9295462

commit 203152faad9ccda93c9f799ef48c47d22da1d3bf
Author: Likun Zhang <zlkzhy at gmail.com>
Date:   Tue Dec 28 08:50:44 2010 +0000

    Implement the interface MessageCache::Lookup.
    
    git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac449@4028 e5f2f494-b856-4b98-b285-d166d9295462

commit b6b9f884f331a4f8726a3cd6a0f3eed7870b7cf8
Author: Likun Zhang <zlkzhy at gmail.com>
Date:   Tue Dec 28 05:40:54 2010 +0000

    Update the interfaces of message entry.
    
    git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac449@4027 e5f2f494-b856-4b98-b285-d166d9295462

commit 5efcee702cfe268615733f30988abca319089531
Author: Likun Zhang <zlkzhy at gmail.com>
Date:   Mon Dec 27 10:45:41 2010 +0000

    Commit unfinished code of recursor cache, in case it is deleted by mistake.
    
    git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac449@4017 e5f2f494-b856-4b98-b285-d166d9295462

commit 5a7d082452848daa9dcb0b023f0829d457d8bcc0
Author: Likun Zhang <zlkzhy at gmail.com>
Date:   Fri Dec 24 05:44:35 2010 +0000

    create working branch for ticket 449
    
    git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac449@4003 e5f2f494-b856-4b98-b285-d166d9295462

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

More information about the bind10-changes mailing list