BIND 10 master, updated. 4e99a42d3634690c74963ec9fc5c45ae21431775 Merge branch 'master' of ssh://git.bind10.isc.org//var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  4e99a42d3634690c74963ec9fc5c45ae21431775 (commit)
       via  2e74ee9f329249738ddf00599090f94ef80eecc1 (commit)
      from  bc1c9342a382378d6d659e3fcf87d6730ea71e81 (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 4e99a42d3634690c74963ec9fc5c45ae21431775
Merge: 2e74ee9f329249738ddf00599090f94ef80eecc1 bc1c9342a382378d6d659e3fcf87d6730ea71e81
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Mon Oct 10 13:17:58 2011 -0500

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

commit 2e74ee9f329249738ddf00599090f94ef80eecc1
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Mon Oct 10 13:13:06 2011 -0500

    [master] make descend into testdata directory before local tests
    
    I mentioned this on jabber last week:
    Why would it want to do the local directory tests before the testdata
    is generated?
    
    This issue is never noticed yet because the testdata was built
    at build time and not check time.

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

Summary of changes:
 src/lib/datasrc/tests/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am
index 3183b1d..3d2ba6d 100644
--- a/src/lib/datasrc/tests/Makefile.am
+++ b/src/lib/datasrc/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . testdata
+SUBDIRS = testdata
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_builddir)/src/lib/dns -I$(top_srcdir)/src/lib/dns