BIND 10 trac2096, created. 06c7f0d32276b1359868632ba73f2fd5d34ef6fd Merge #2133

[BIND 10 source code commits]

The branch, trac2096 has been created
        at  06c7f0d32276b1359868632ba73f2fd5d34ef6fd (commit)

- Log -----------------------------------------------------------------
commit 06c7f0d32276b1359868632ba73f2fd5d34ef6fd
Merge: dc26ce9 4c8637f
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Mon Aug 6 12:38:06 2012 +0200

    Merge #2133

commit 4c8637f7ec592c0c0f827567a83663e985f9542d
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Mon Aug 6 12:36:06 2012 +0200

    [2133] Minor fix
    
    The previous version was slightly misleading, the reader could
    understand it the queries would be just slow as answered from the DB,
    instead of not answered at all.

commit 7743d37cd55250ae26687d7f6ca8a22f20da6799
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Aug 6 11:46:56 2012 +0200

    [2133] a few small changes in the new documentation

commit dc26ce9dfdb9ea97e0a4f74485d6d6d9af0835da
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Aug 6 09:49:13 2012 +0200

    [master] update changelog for merge of 2126
    
    since the b10-showtech had not been released yet, I just replaced its name in the existing changelog entry

commit 1ecb73e5bf38c5dc4efad44aac0331e487829d89
Merge: a77342a bb14715
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Aug 6 09:32:06 2012 +0200

    [master] Merge branch 'trac2126'

commit a77342a649b33001245341f2e6a038a7fc7673d6
Author: Mukund Sivaraman <muks at isc.org>
Date:   Sat Aug 4 02:13:30 2012 +0530

    [master] Update .gitignore files

commit 7127237c184ff0fdf0535b9e8234dd71598b996e
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Aug 3 10:00:01 2012 -0700

    [master] changelog for #2147

commit 30061d1139aad8716e97d6b620c259752fd0a3cd
Merge: c149373 90f55cd
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Aug 3 09:55:11 2012 -0700

    [master] Merge branch 'trac2147'

commit 336e7f1a28d2abe8568cb7001c5c38da42bc3f7b
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Aug 2 12:41:40 2012 +0200

    [2133] Document the old way
    
    Which is still used in some places.

commit f3b0c13a93d6cf49c42d25f1383ad81317169a0d
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Aug 1 15:09:56 2012 +0200

    [2133] Update the guide about data_sources
    
    Describe the data sources in the guide.

commit 8145395b1a6680f3efc7baa0a05663c07b670dc1
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Aug 1 14:36:01 2012 +0200

    [2133] Don't use defaults in lettuce
    
    Because the defaults include references to files in install directory
    and lettuce breaks when the files are not yet installed. This should fix
    bug #2159 as well.

commit 8a9addc70d264708dc92a328d5ccf02465fcbb15
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Aug 1 14:32:16 2012 +0200

    [2133] Provide reasonable default for data_sources
    
    Include the default sqlite3 database as well. This is easier than
    documenting everything and it would just work.

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