summaryrefslogtreecommitdiff
path: root/src/docs
diff options
context:
space:
mode:
authorKeith Bostic <keith.bostic@mongodb.com>2016-08-24 20:58:36 -0400
committerMichael Cahill <michael.cahill@mongodb.com>2016-08-25 10:58:36 +1000
commit2ddc171b47690a42d6477cfc469f4fa62f885517 (patch)
tree67d324f9bf790cae360975a89bd984c2969a3fd5 /src/docs
parent78fbc074082a47c96a619d766c335483c2c15556 (diff)
downloadmongo-2ddc171b47690a42d6477cfc469f4fa62f885517.tar.gz
WT-2695 Integrate s390x accelerated crc32c support (#2967)
* Add X86_HOST and ZSERIES_HOST to the Windows SConstruct file. * Add smoke-test for CRC functions. * Library for accelerated CRC-32 checksums on the IBM z13 processor Pulled from https://github.com/linux-on-ibm-z/crc32-s390x.
Diffstat (limited to 'src/docs')
-rw-r--r--src/docs/license.dox15
-rw-r--r--src/docs/spell.ok1
2 files changed, 14 insertions, 2 deletions
diff --git a/src/docs/license.dox b/src/docs/license.dox
index d7814d04fd6..b70823202ad 100644
--- a/src/docs/license.dox
+++ b/src/docs/license.dox
@@ -46,7 +46,7 @@ of the WiredTiger library should comply with these copyrights.
@row{\c src/support/hash_fnv.c, Authors, Public Domain}
</table>
-@section license_crc32-vpmsum 3rd party software optionally included in the WiredTiger library: PPC64
+@section license_crc32-power8 3rd party software optionally included in the WiredTiger library: PPC64
PPC64 and PPC64LE builds of the WiredTiger library binary include additional
3rd party software, distributed under separate license terms. Redistribution
@@ -55,7 +55,18 @@ copyrights.
<table>
@hrow{Distribution Files, Copyright Holder, License}
-@row{\c src/support/power8/*, Anton Blanchard, <a href="http://opensource.org/licenses/Apache-2.0">Apache License\, Version 2.0</a> or the <a href="http://www.gnu.org/licenses/gpl-2.0-standalone.html">GNU General Public License\, version 2 or later</a>}
+@row{\c src/support/power8/*, Anton Blanchard\, IBM Corp., <a href="http://opensource.org/licenses/Apache-2.0">Apache License\, Version 2.0</a> or the <a href="http://www.gnu.org/licenses/gpl-2.0-standalone.html">GNU General Public License\, version 2 or later</a>}
+</table>
+
+@section license_crc32-zseries 3rd party software optionally included in the WiredTiger library: s390x
+
+IBM z13 processor builds of the WiredTiger library binary include additional
+3rd party software, distributed under separate license terms. Redistribution
+of the WiredTiger library z13 builds should comply with these copyrights.
+
+<table>
+@hrow{Distribution Files, Copyright Holder, License}
+@row{\c src/support/zseries/*, IBM Corp., <a href="http://opensource.org/licenses/Apache-2.0">Apache License\, Version 2.0</a> or the <a href="http://www.gnu.org/licenses/gpl-2.0-standalone.html">GNU General Public License\, version 2 or later</a>}
</table>
@section license_leveldb 3rd party software optionally included in the WiredTiger library: LevelDB
diff --git a/src/docs/spell.ok b/src/docs/spell.ok
index 539705961a4..a2ef7658ec6 100644
--- a/src/docs/spell.ok
+++ b/src/docs/spell.ok
@@ -506,3 +506,4 @@ wtstats
xa
yieldcpu
zlib
+zseries