You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/02/09 19:01:48 UTC
accumulo git commit: ACCUMULO-3571 Addendum to LICENSE for protobuf
Repository: accumulo
Updated Branches:
refs/heads/master 0f558bfe8 -> 07040f1a6
ACCUMULO-3571 Addendum to LICENSE for protobuf
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/07040f1a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/07040f1a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/07040f1a
Branch: refs/heads/master
Commit: 07040f1a6fc6a967973e8967b2e26ca24b5324e9
Parents: 0f558bf
Author: Josh Elser <jo...@gmail.com>
Authored: Mon Feb 9 13:01:21 2015 -0500
Committer: Josh Elser <jo...@gmail.com>
Committed: Mon Feb 9 13:01:21 2015 -0500
----------------------------------------------------------------------
LICENSE | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/07040f1a/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7af5fb8..d433f05 100644
--- a/LICENSE
+++ b/LICENSE
@@ -256,3 +256,40 @@ under the following "3-clause BSD" license:
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
+The binary distribution of this product bundles Protocol Buffers, which is available
+under the following "3-clause BSD" license:
+
+ Copyright 2014, Google Inc. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
+
+ Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 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
+ distribution.
+
+ Neither the name of Google Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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.
+
+ Code generated by the Protocol Buffer compiler is owned by the owner
+ of the input file used when generating it. This code is not
+ standalone and requires a support library to be linked with it. This
+ support library is itself covered by the above license.