[SCM] ISC BIND 10 source code branch, master, updated. a07e078b4feeb01949133fc88c9939254c38aa7c

[BIND 10 source code commits]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "ISC BIND 10 source code".

The branch, master has been updated
       via  a07e078b4feeb01949133fc88c9939254c38aa7c (commit)
       via  a039907d688e2ae82af39369baa72a9c43805eb1 (commit)
       via  3c337419ad37fb4af2d14e7d470e7c9c35790b40 (commit)
       via  d6d7f1157668e98a1f849d53258b8f9c1dee1c78 (commit)
       via  ce2fead07b25247d05b3175a30863a898b819db1 (commit)
      from  748885cd80a12aad0f02fc7b53943c2620d9eb22 (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 a07e078b4feeb01949133fc88c9939254c38aa7c
Merge: 748885cd80a12aad0f02fc7b53943c2620d9eb22 a039907d688e2ae82af39369baa72a9c43805eb1
Author: Jelte Jansen <jelte at isc.org>
Date:   Tue Jan 25 16:57:41 2011 +0100

    Merge branch 'trac483'
    
    Conflicts:
    	src/bin/resolver/resolver.cc

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

Summary of changes:
 src/bin/resolver/resolver.cc                       |   41 +++++++++++++++++++-
 src/bin/resolver/resolver.h                        |   18 +++++++++
 src/bin/resolver/resolver.spec.pre.in              |   26 ++++++++++++
 src/bin/resolver/tests/resolver_config_unittest.cc |   25 ++++++++++++
 src/lib/asiolink/asiolink.cc                       |   34 ++++++++++++++--
 src/lib/asiolink/asiolink.h                        |    9 ++++-
 src/lib/asiolink/tests/asiolink_unittest.cc        |   24 +++++++----
 7 files changed, 160 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
ISC BIND 10 source code