BIND 10 master, updated. a7dbb75a88c71513c2ff2d0c86eb98b1f287e6f4 [master]Merge branch 'master' of ssh://git.bind10.isc.org//var/bind10/git/bind10

BIND 10 source code commits bind10-changes at lists.isc.org
Mon Apr 16 19:25:01 UTC 2012


The branch, master has been updated
       via  a7dbb75a88c71513c2ff2d0c86eb98b1f287e6f4 (commit)
       via  952cf4c1d92cf00179347abbc15fa37318c5ec90 (commit)
       via  277af902ee91a90c1ef8ebce3895ecc27d8dec2d (commit)
      from  56bd002f57d397ec4c1fffb40c499425e36b21de (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 a7dbb75a88c71513c2ff2d0c86eb98b1f287e6f4
Merge: 952cf4c1d92cf00179347abbc15fa37318c5ec90 56bd002f57d397ec4c1fffb40c499425e36b21de
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Mon Apr 16 14:24:58 2012 -0500

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

commit 952cf4c1d92cf00179347abbc15fa37318c5ec90
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Mon Apr 16 14:24:20 2012 -0500

    [master] add boost license used by the external code

commit 277af902ee91a90c1ef8ebce3895ecc27d8dec2d
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Mon Apr 16 14:24:01 2012 -0500

    [master] mention external code using boost license

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

Summary of changes:
 COPYING             |    6 ++++++
 ext/LICENSE_1_0.txt |   23 +++++++++++++++++++++++
 2 files changed, 29 insertions(+), 0 deletions(-)
 create mode 100644 ext/LICENSE_1_0.txt

-----------------------------------------------------------------------
diff --git a/COPYING b/COPYING
index 557bdfb..63717af 100644
--- a/COPYING
+++ b/COPYING
@@ -11,3 +11,9 @@ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
+
+-----------------------------------------------------------------------------
+
+The ext/asio and ext/coroutine code is externally maintained and
+distributed under the Boost Software License, Version 1.0.
+(See accompanying file ext/LICENSE_1_0.txt.)
diff --git a/ext/LICENSE_1_0.txt b/ext/LICENSE_1_0.txt
new file mode 100644
index 0000000..36b7cd9
--- /dev/null
+++ b/ext/LICENSE_1_0.txt
@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.



More information about the bind10-changes mailing list