[svn] commit: r3827 - in /branches/trac229: ./ ChangeLog configure.ac doc/Doxyfile src/bin/bind10/bind10.py.in src/lib/Makefile.am src/lib/nsas/ src/lib/python/isc/utils/

[BIND 10 source code commits]

Author: stephen
Date: Tue Dec 14 11:36:12 2010
New Revision: 3827

Log:
Commit after a merge with trunk.

Added:
    branches/trac229/src/lib/nsas/
      - copied from r3826, trunk/src/lib/nsas/
Modified:
    branches/trac229/   (props changed)
    branches/trac229/ChangeLog
    branches/trac229/configure.ac
    branches/trac229/doc/Doxyfile
    branches/trac229/src/bin/bind10/bind10.py.in   (props changed)
    branches/trac229/src/lib/Makefile.am
    branches/trac229/src/lib/python/isc/utils/   (props changed)

Modified: branches/trac229/ChangeLog
==============================================================================
--- branches/trac229/ChangeLog (original)
+++ branches/trac229/ChangeLog Tue Dec 14 11:36:12 2010
@@ -1,3 +1,9 @@
+  126.  [func]      stephen, vorner, ocean
+	The Nameserver Address Store (NSAS) component has been added. It takes
+	care of choosing an IP address of a nameserver when a zone needs to be
+	contacted.
+	(Trac #356, Trac #408, svn r3823)
+
 bind10-devel-20101201 released on December 01, 2010
 
   125.  [func]		jelte

Modified: branches/trac229/configure.ac
==============================================================================
--- branches/trac229/configure.ac (original)
+++ branches/trac229/configure.ac Tue Dec 14 11:36:12 2010
@@ -518,6 +518,8 @@
                  src/lib/datasrc/Makefile
                  src/lib/datasrc/tests/Makefile
                  src/lib/xfr/Makefile
+                 src/lib/nsas/Makefile
+                 src/lib/nsas/tests/Makefile
                ])
 AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
            src/bin/cfgmgr/tests/b10-cfgmgr_test.py

Modified: branches/trac229/doc/Doxyfile
==============================================================================
--- branches/trac229/doc/Doxyfile (original)
+++ branches/trac229/doc/Doxyfile Tue Dec 14 11:36:12 2010
@@ -568,7 +568,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = ../src/lib/cc ../src/lib/config ../src/lib/dns ../src/lib/exceptions ../src/lib/datasrc ../src/bin/auth ../src/lib/bench
+INPUT                  = ../src/lib/cc ../src/lib/config ../src/lib/dns ../src/lib/exceptions ../src/lib/datasrc ../src/bin/auth ../src/lib/bench ../src/lib/nsas
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

Modified: branches/trac229/src/lib/Makefile.am
==============================================================================
--- branches/trac229/src/lib/Makefile.am (original)
+++ branches/trac229/src/lib/Makefile.am Tue Dec 14 11:36:12 2010
@@ -1,1 +1,1 @@
-SUBDIRS = exceptions dns cc config datasrc python xfr bench
+SUBDIRS = exceptions dns cc config datasrc python xfr bench nsas