BIND 10 trac1947-cont, created. 5fba01f28ca9b4a07417b40c0fc016eed2cdc7fa Merge #2046

[BIND 10 source code commits]

The branch, trac1947-cont has been created
        at  5fba01f28ca9b4a07417b40c0fc016eed2cdc7fa (commit)

- Log -----------------------------------------------------------------
commit 5fba01f28ca9b4a07417b40c0fc016eed2cdc7fa
Merge: 4f90ffd 7d3bb3b
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Sat Jun 30 21:52:35 2012 +0200

    Merge #2046
    
    With integration into the rest.
    
    Conflicts:
    	src/lib/datasrc/client_list.h

commit 4f90ffd6c73b67efc830da23a101f9095b2540f8
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Sat Jun 30 21:28:07 2012 +0200

    [1976] Include the cache options in spec
    
    The cache-enable and cache-zones options are now in the datasrc spec
    file.

commit 6dc6d1f5d551d833a86b38297b9e209271fbdea3
Merge: af4e778 afddf88
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Sat Jun 30 20:53:29 2012 +0200

    Merge #2044
    
    It is the cache for ClientList.
    
    Conflicts:
    	src/lib/datasrc/client_list.cc
    	src/lib/datasrc/client_list.h
    	src/lib/datasrc/tests/client_list_unittest.cc

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