You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2016/07/22 10:04:27 UTC
[1/5] couchdb commit: updated refs/heads/master to 7b3f5d0
Repository: couchdb
Updated Branches:
refs/heads/master bdb68b9c0 -> 7b3f5d03f
Use new couch_log version
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f7823b87
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f7823b87
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f7823b87
Branch: refs/heads/master
Commit: f7823b874c4d9563fd1823e1030b0a0c5d20d5fe
Parents: 094ceae
Author: Paul J. Davis <pa...@gmail.com>
Authored: Fri Jul 22 05:03:21 2016 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Fri Jul 22 05:04:09 2016 -0500
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f7823b87/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index f92be36..bf81a78 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -27,7 +27,7 @@ DepDescs = [
{config, "config", "60977f81dc06af4a3d1e89891b3061ed4cd01e95"},
%% keep these sorted
{b64url, "b64url", "6895652d80f95cdf04efb14625abed868998f174"},
-{couch_log, "couch-log", {branch, "3067-improve-couch-log"}},
+{couch_log, "couch-log", "da0e48964f8175f8a8956ff1a25e047c3b2e0e2d"},
{chttpd, "chttpd", "5e3bf1f5e2e96841ce0d2b26606c7f590c067bdc"},
{couch, "couch", "ac3dae37da1e44dfba6fbed8ec11fa1c6779ee33"},
{couch_index, "couch-index", "e7d269800302224eacf9585f74eb30822495755b"},
[3/5] couchdb commit: updated refs/heads/master to 7b3f5d0
Posted by da...@apache.org.
Remove lager and its dependencies
COUCHDB-3067
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/77775950
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/77775950
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/77775950
Branch: refs/heads/master
Commit: 7777595015b8160ba43c17a4452f56e109b9565a
Parents: bdb68b9
Author: Paul J. Davis <pa...@gmail.com>
Authored: Fri Jul 22 04:52:28 2016 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Fri Jul 22 05:04:09 2016 -0500
----------------------------------------------------------------------
Makefile | 2 +-
Makefile.win | 2 +-
configure | 2 --
rebar.config.script | 4 +---
rel/files/eunit.config | 21 +--------------------
rel/files/sys.config | 19 +------------------
rel/reltool.config | 6 ------
7 files changed, 5 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/77775950/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 2c9075b..c3f0745 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ DESTDIR=
# Rebar options
apps=
-skip_deps=folsom,lager,meck,mochiweb,proper,snappy
+skip_deps=folsom,meck,mochiweb,proper,snappy
suites=
tests=
http://git-wip-us.apache.org/repos/asf/couchdb/blob/77775950/Makefile.win
----------------------------------------------------------------------
diff --git a/Makefile.win b/Makefile.win
index 83d88fa..168b2ff 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -25,7 +25,7 @@ DESTDIR=
# Rebar options
apps=
-skip_deps=folsom,lager,meck,mochiweb,proper,snappy
+skip_deps=folsom,meck,mochiweb,proper,snappy
suites=
tests=
http://git-wip-us.apache.org/repos/asf/couchdb/blob/77775950/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 1a7677a..74c5787 100755
--- a/configure
+++ b/configure
@@ -208,8 +208,6 @@ EOF
cat > $rootdir/config.erl << EOF
{with_curl, $WITH_CURL}.
-{couch_log_backend, couch_log_lager}.
-{couch_log_backend_apps, {list, [couch_log_lager]}}.
EOF
http://git-wip-us.apache.org/repos/asf/couchdb/blob/77775950/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 1cdc9fd..f92be36 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -27,8 +27,7 @@ DepDescs = [
{config, "config", "60977f81dc06af4a3d1e89891b3061ed4cd01e95"},
%% keep these sorted
{b64url, "b64url", "6895652d80f95cdf04efb14625abed868998f174"},
-{couch_log, "couch-log", "cc5540419e0a4bb7872d18bc5a94f39446d83a88"},
-{couch_log_lager, "couch-log-lager", "a7a8b7efb8855a8b0cf9612eeca7c190c414bbfb"},
+{couch_log, "couch-log", {branch, "3067-improve-couch-log"}},
{chttpd, "chttpd", "5e3bf1f5e2e96841ce0d2b26606c7f590c067bdc"},
{couch, "couch", "ac3dae37da1e44dfba6fbed8ec11fa1c6779ee33"},
{couch_index, "couch-index", "e7d269800302224eacf9585f74eb30822495755b"},
@@ -46,7 +45,6 @@ DepDescs = [
{fauxton, "fauxton", {tag, "v1.1.5"}, [raw]},
{folsom, "folsom", "a5c95dec18227c977029fbd3b638966d98f17003"},
{global_changes, "global-changes", "203fb088ed81149108e64d18ffd9c3f5df154f97"},
-{goldrush, "goldrush", {tag, "0.1.6"}},
{ibrowse, "ibrowse", "4af2d408607874d124414ac45df1edbe3961d1cd"},
{ioq, "ioq", "c7c75ebeaf41599e3a3e211097d864f0e7785829"},
{jiffy, "jiffy", "d3c00e19d8fa20c21758402231247602190988d3"},
http://git-wip-us.apache.org/repos/asf/couchdb/blob/77775950/rel/files/eunit.config
----------------------------------------------------------------------
diff --git a/rel/files/eunit.config b/rel/files/eunit.config
index 3ed74c0..97562f5 100644
--- a/rel/files/eunit.config
+++ b/rel/files/eunit.config
@@ -10,23 +10,4 @@
% License for the specific language governing permissions and limitations under
% the License.
-[
- {kernel, [{error_logger, silent}]},
- {sasl, [{sasl_error_logger, false}]},
- {lager, [
- {error_logger_hwm, 1000},
- {error_logger_redirect, true},
- {handlers, [
- {lager_console_backend, [error, {
- lager_default_formatter,
- [
- date, " ", time,
- " [", severity, "] ",
- node, " ", pid, " ",
- message,
- "\n"
- ]
- }]}
- ]}
- ]}
-].
+[].
http://git-wip-us.apache.org/repos/asf/couchdb/blob/77775950/rel/files/sys.config
----------------------------------------------------------------------
diff --git a/rel/files/sys.config b/rel/files/sys.config
index 9c2142d..97562f5 100644
--- a/rel/files/sys.config
+++ b/rel/files/sys.config
@@ -10,21 +10,4 @@
% License for the specific language governing permissions and limitations under
% the License.
-[
- {lager, [
- {error_logger_hwm, 1000},
- {error_logger_redirect, true},
- {handlers, [
- {lager_console_backend, [info, {
- lager_default_formatter,
- [
- date, " ", time,
- " [", severity, "] ",
- node, " ", pid, " ",
- message,
- "\n"
- ]
- }]}
- ]}
- ]}
-].
+[].
http://git-wip-us.apache.org/repos/asf/couchdb/blob/77775950/rel/reltool.config
----------------------------------------------------------------------
diff --git a/rel/reltool.config b/rel/reltool.config
index 4c990a8..9c1f67f 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -35,7 +35,6 @@
couch_epi,
couch_index,
couch_log,
- couch_log_lager,
couch_mrview,
couch_plugins,
couch_replicator,
@@ -47,12 +46,10 @@
fabric,
folsom,
global_changes,
- goldrush,
ibrowse,
ioq,
jiffy,
khash,
- lager,
mango,
mem3,
mochiweb,
@@ -92,7 +89,6 @@
{app, couch_epi, [{incl_cond, include}]},
{app, couch_index, [{incl_cond, include}]},
{app, couch_log, [{incl_cond, include}]},
- {app, couch_log_lager, [{incl_cond, include}]},
{app, couch_mrview, [{incl_cond, include}]},
{app, couch_plugins, [{incl_cond, include}]},
{app, couch_replicator, [{incl_cond, include}]},
@@ -104,12 +100,10 @@
{app, fabric, [{incl_cond, include}]},
{app, folsom, [{incl_cond, include}]},
{app, global_changes, [{incl_cond, include}]},
- {app, goldrush, [{incl_cond, include}]},
{app, ibrowse, [{incl_cond, include}]},
{app, ioq, [{incl_cond, include}]},
{app, jiffy, [{incl_cond, include}]},
{app, khash, [{incl_cond, include}]},
- {app, lager, [{incl_cond, include}]},
{app, mango, [{incl_cond, include}]},
{app, mem3, [{incl_cond, include}]},
{app, mochiweb, [{incl_cond, include}]},
[5/5] couchdb commit: updated refs/heads/master to 7b3f5d0
Posted by da...@apache.org.
Merge branch '3067-make-couch-log-smarter'
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7b3f5d03
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7b3f5d03
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7b3f5d03
Branch: refs/heads/master
Commit: 7b3f5d03fd51d9653bbfd6dc79e91e3ad5186d28
Parents: bdb68b9 f7823b8
Author: Paul J. Davis <pa...@gmail.com>
Authored: Fri Jul 22 05:04:17 2016 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Fri Jul 22 05:04:17 2016 -0500
----------------------------------------------------------------------
LICENSE | 300 ++++++++++++++++++++++++++++++++++++++-
Makefile | 2 +-
Makefile.win | 2 +-
configure | 2 -
rebar.config.script | 4 +-
rel/files/eunit.config | 21 +--
rel/files/sys.config | 19 +--
rel/overlay/etc/default.ini | 35 +++--
rel/reltool.config | 6 -
9 files changed, 328 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
[4/5] couchdb commit: updated refs/heads/master to 7b3f5d0
Posted by da...@apache.org.
Add config file notes for new logging options
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4c972ab2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4c972ab2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4c972ab2
Branch: refs/heads/master
Commit: 4c972ab247e24d2f8ce6c2575c99cc2839afcd28
Parents: 7777595
Author: Paul J. Davis <pa...@gmail.com>
Authored: Fri Jul 22 05:00:18 2016 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Fri Jul 22 05:04:09 2016 -0500
----------------------------------------------------------------------
rel/overlay/etc/default.ini | 35 +++++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4c972ab2/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 02dd392..5eeb938 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -393,19 +393,38 @@ min_file_size = 131072
;_default = [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "23:00"}, {to, "04:00"}]
[log]
-; CouchDB logging backend
-; Currently supported only two: stderr and lager
-backend = lager
+; Set the log writer to use
+; Current writers include:
+; stderr
+; file
+; syslog
+; You can also specify a full module name
+; here if you want to implement your own
+; writer. See couch_log_writer.erl for
+; more information on the (simple) API.
+writer = stderr
+
+; Options for the file writer
+; file = /path/to/couch.log
+; write_buffer = size_in_bytes
+; write_delay = time_in_milliseconds
+
+; Options for the syslog writer
+; syslog_host = remote host
+; syslog_port = 514
+; syslog_appid = couchdb
+; syslog_facility = local2
+
; Possible logging levels (sorted by level):
; none
-; emergency
+; emergency, emerg
; alert
-; critical
-; error
-; warning
+; critical, crit
+; error, err
+; warning, warn
; notice
; info
; debug
; Each controls how verbose logging will be. Higher level mean less log output.
-; none level turns logging off, except for crashes.
+; none level turns logging off
level = info
[2/5] couchdb commit: updated refs/heads/master to 7b3f5d0
Posted by da...@apache.org.
Add EPL to LICENSE for trunc_io modules
COUCHDB-3067
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/094ceae9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/094ceae9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/094ceae9
Branch: refs/heads/master
Commit: 094ceae9fd81f1d71647728d4a2e583423618914
Parents: 4c972ab
Author: Paul J. Davis <pa...@gmail.com>
Authored: Fri Jul 22 05:02:08 2016 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Fri Jul 22 05:04:09 2016 -0500
----------------------------------------------------------------------
LICENSE | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 296 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/094ceae9/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index f3b4673..4f7f04e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -360,10 +360,10 @@ For the test/etap/etap.erl component:
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
-
+
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
-
+
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 AND
@@ -373,6 +373,298 @@ For the test/etap/etap.erl component:
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
+
+For the src/couch_log/src/couch_log_trunc_io.erl and
+ the src/couch_log/src/couch_log_trunc_io_fmt.erl components
+
+ERLANG PUBLIC LICENSE
+Version 1.1
+
+1. Definitions.
+
+1.1. ``Contributor'' means each entity that creates or contributes to
+the creation of Modifications.
+
+1.2. ``Contributor Version'' means the combination of the Original
+Code, prior Modifications used by a Contributor, and the Modifications
+made by that particular Contributor.
+
+1.3. ``Covered Code'' means the Original Code or Modifications or the
+combination of the Original Code and Modifications, in each case
+including portions thereof.
+
+1.4. ``Electronic Distribution Mechanism'' means a mechanism generally
+accepted in the software development community for the electronic
+transfer of data.
+
+1.5. ``Executable'' means Covered Code in any form other than Source
+Code.
+
+1.6. ``Initial Developer'' means the individual or entity identified
+as the Initial Developer in the Source Code notice required by Exhibit
+A.
+
+1.7. ``Larger Work'' means a work which combines Covered Code or
+portions thereof with code not governed by the terms of this License.
+
+1.8. ``License'' means this document.
+
+1.9. ``Modifications'' means any addition to or deletion from the
+substance or structure of either the Original Code or any previous
+Modifications. When Covered Code is released as a series of files, a
+Modification is:
+
+A. Any addition to or deletion from the contents of a file containing
+ Original Code or previous Modifications.
+
+B. Any new file that contains any part of the Original Code or
+ previous Modifications.
+
+1.10. ``Original Code'' means Source Code of computer software code
+which is described in the Source Code notice required by Exhibit A as
+Original Code, and which, at the time of its release under this
+License is not already Covered Code governed by this License.
+
+1.11. ``Source Code'' means the preferred form of the Covered Code for
+making modifications to it, including all modules it contains, plus
+any associated interface definition files, scripts used to control
+compilation and installation of an Executable, or a list of source
+code differential comparisons against either the Original Code or
+another well known, available Covered Code of the Contributor's
+choice. The Source Code can be in a compressed or archival form,
+provided the appropriate decompression or de-archiving software is
+widely available for no charge.
+
+1.12. ``You'' means an individual or a legal entity exercising rights
+under, and complying with all of the terms of, this License. For legal
+entities,``You'' includes any entity which controls, is controlled by,
+or is under common control with You. For purposes of this definition,
+``control'' means (a) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (b) ownership of fifty percent (50%) or more of the
+outstanding shares or beneficial ownership of such entity.
+
+2. Source Code License.
+
+2.1. The Initial Developer Grant.
+The Initial Developer hereby grants You a world-wide, royalty-free,
+non-exclusive license, subject to third party intellectual property
+claims:
+
+(a) to use, reproduce, modify, display, perform, sublicense and
+ distribute the Original Code (or portions thereof) with or without
+ Modifications, or as part of a Larger Work; and
+
+(b) under patents now or hereafter owned or controlled by Initial
+ Developer, to make, have made, use and sell (``Utilize'') the
+ Original Code (or portions thereof), but solely to the extent that
+ any such patent is reasonably necessary to enable You to Utilize
+ the Original Code (or portions thereof) and not to any greater
+ extent that may be necessary to Utilize further Modifications or
+ combinations.
+
+2.2. Contributor Grant.
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license, subject to third party intellectual property
+claims:
+
+(a) to use, reproduce, modify, display, perform, sublicense and
+ distribute the Modifications created by such Contributor (or
+ portions thereof) either on an unmodified basis, with other
+ Modifications, as Covered Code or as part of a Larger Work; and
+
+(b) under patents now or hereafter owned or controlled by Contributor,
+ to Utilize the Contributor Version (or portions thereof), but
+ solely to the extent that any such patent is reasonably necessary
+ to enable You to Utilize the Contributor Version (or portions
+ thereof), and not to any greater extent that may be necessary to
+ Utilize further Modifications or combinations.
+
+3. Distribution Obligations.
+
+3.1. Application of License.
+The Modifications which You contribute are governed by the terms of
+this License, including without limitation Section 2.2. The Source
+Code version of Covered Code may be distributed only under the terms
+of this License, and You must include a copy of this License with
+every copy of the Source Code You distribute. You may not offer or
+impose any terms on any Source Code version that alters or restricts
+the applicable version of this License or the recipients' rights
+hereunder. However, You may include an additional document offering
+the additional rights described in Section 3.5.
+
+3.2. Availability of Source Code.
+Any Modification which You contribute must be made available in Source
+Code form under the terms of this License either on the same media as
+an Executable version or via an accepted Electronic Distribution
+Mechanism to anyone to whom you made an Executable version available;
+and if made available via Electronic Distribution Mechanism, must
+remain available for at least twelve (12) months after the date it
+initially became available, or at least six (6) months after a
+subsequent version of that particular Modification has been made
+available to such recipients. You are responsible for ensuring that
+the Source Code version remains available even if the Electronic
+Distribution Mechanism is maintained by a third party.
+
+3.3. Description of Modifications.
+You must cause all Covered Code to which you contribute to contain a
+file documenting the changes You made to create that Covered Code and
+the date of any change. You must include a prominent statement that
+the Modification is derived, directly or indirectly, from Original
+Code provided by the Initial Developer and including the name of the
+Initial Developer in (a) the Source Code, and (b) in any notice in an
+Executable version or related documentation in which You describe the
+origin or ownership of the Covered Code.
+
+3.4. Intellectual Property Matters
+
+(a) Third Party Claims.
+ If You have knowledge that a party claims an intellectual property
+ right in particular functionality or code (or its utilization
+ under this License), you must include a text file with the source
+ code distribution titled ``LEGAL'' which describes the claim and
+ the party making the claim in sufficient detail that a recipient
+ will know whom to contact. If you obtain such knowledge after You
+ make Your Modification available as described in Section 3.2, You
+ shall promptly modify the LEGAL file in all copies You make
+ available thereafter and shall take other steps (such as notifying
+ appropriate mailing lists or newsgroups) reasonably calculated to
+ inform those who received the Covered Code that new knowledge has
+ been obtained.
+
+(b) Contributor APIs.
+ If Your Modification is an application programming interface and
+ You own or control patents which are reasonably necessary to
+ implement that API, you must also include this information in the
+ LEGAL file.
+
+3.5. Required Notices.
+You must duplicate the notice in Exhibit A in each file of the Source
+Code, and this License in any documentation for the Source Code, where
+You describe recipients' rights relating to Covered Code. If You
+created one or more Modification(s), You may add your name as a
+Contributor to the notice described in Exhibit A. If it is not
+possible to put such notice in a particular Source Code file due to
+its structure, then you must include such notice in a location (such
+as a relevant directory file) where a user would be likely to look for
+such a notice. You may choose to offer, and to charge a fee for,
+warranty, support, indemnity or liability obligations to one or more
+recipients of Covered Code. However, You may do so only on Your own
+behalf, and not on behalf of the Initial Developer or any
+Contributor. You must make it absolutely clear than any such warranty,
+support, indemnity or liability obligation is offered by You alone,
+and You hereby agree to indemnify the Initial Developer and every
+Contributor for any liability incurred by the Initial Developer or
+such Contributor as a result of warranty, support, indemnity or
+liability terms You offer.
+
+3.6. Distribution of Executable Versions.
+You may distribute Covered Code in Executable form only if the
+requirements of Section 3.1-3.5 have been met for that Covered Code,
+and if You include a notice stating that the Source Code version of
+the Covered Code is available under the terms of this License,
+including a description of how and where You have fulfilled the
+obligations of Section 3.2. The notice must be conspicuously included
+in any notice in an Executable version, related documentation or
+collateral in which You describe recipients' rights relating to the
+Covered Code. You may distribute the Executable version of Covered
+Code under a license of Your choice, which may contain terms different
+from this License, provided that You are in compliance with the terms
+of this License and that the license for the Executable version does
+not attempt to limit or alter the recipient's rights in the Source
+Code version from the rights set forth in this License. If You
+distribute the Executable version under a different license You must
+make it absolutely clear that any terms which differ from this License
+are offered by You alone, not by the Initial Developer or any
+Contributor. You hereby agree to indemnify the Initial Developer and
+every Contributor for any liability incurred by the Initial Developer
+or such Contributor as a result of any such terms You offer.
+
+3.7. Larger Works.
+You may create a Larger Work by combining Covered Code with other code
+not governed by the terms of this License and distribute the Larger
+Work as a single product. In such a case, You must make sure the
+requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Code due to statute
+or regulation then You must: (a) comply with the terms of this License
+to the maximum extent possible; and (b) describe the limitations and
+the code they affect. Such description must be included in the LEGAL
+file described in Section 3.4 and must be included with all
+distributions of the Source Code. Except to the extent prohibited by
+statute or regulation, such description must be sufficiently detailed
+for a recipient of ordinary skill to be able to understand it.
+
+5. Application of this License.
+
+This License applies to code to which the Initial Developer has
+attached the notice in Exhibit A, and to related Covered Code.
+
+6. CONNECTION TO MOZILLA PUBLIC LICENSE
+
+This Erlang License is a derivative work of the Mozilla Public
+License, Version 1.0. It contains terms which differ from the Mozilla
+Public License, Version 1.0.
+
+7. DISCLAIMER OF WARRANTY.
+
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS,
+WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
+NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
+THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE
+IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER
+CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR
+CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART
+OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER
+EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+This License and the rights granted hereunder will terminate
+automatically if You fail to comply with terms herein and fail to cure
+such breach within 30 days of becoming aware of the breach. All
+sublicenses to the Covered Code which are properly granted shall
+survive any termination of this License. Provisions which, by their
+nature, must remain in effect beyond the termination of this License
+shall survive.
+
+9. DISCLAIMER OF LIABILITY
+Any utilization of Covered Code shall not cause the Initial Developer
+or any Contributor to be liable for any damages (neither direct nor
+indirect).
+
+10. MISCELLANEOUS
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision is held to be unenforceable, such
+provision shall be reformed only to the extent necessary to make it
+enforceable. This License shall be construed by and in accordance with
+the substantive laws of Sweden. Any dispute, controversy or claim
+arising out of or relating to this License, or the breach, termination
+or invalidity thereof, shall be subject to the exclusive jurisdiction
+of Swedish courts, with the Stockholm City Court as the first
+instance.
+
+EXHIBIT A.
+
+``The contents of this file are subject to the Erlang Public License,
+Version 1.1, (the "License"); you may not use this file except in
+compliance with the License. You should have received a copy of the
+Erlang Public License along with this software. If not, it can be
+retrieved via the world wide web at http://www.erlang.org/.
+
+Software distributed under the License is distributed on an "AS IS"
+basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+the License for the specific language governing rights and limitations
+under the License.
+
+The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+AB. All Rights Reserved.''
+
+
For the src/ejson/yajl component
Copyright 2010, Lloyd Hilaiel.
@@ -383,7 +675,7 @@ met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
-
+
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
@@ -404,7 +696,7 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-
+
For the src/ejson/erl_nif_compat.h file
Copyright (c) 2010-2011 Basho Technologies, Inc.