Merge branch '1.6'
Conflicts:
LICENSE
NOTICE
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/63544e84
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/63544e84
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/63544e84
Branch: refs/heads/master
Commit: 63544e84eaac1bf814dba94435dff511a938c80a
Parents: efb505b 591a49e
Author: Billie Rinaldi <bil...@apache.org>
Authored: Tue Feb 10 18:59:04 2015 -0800
Committer: Billie Rinaldi <bil...@apache.org>
Committed: Tue Feb 10 18:59:04 2015 -0800
----------------------------------------------------------------------
LICENSE | 28 ++++++++++++++++++++++++++++
NOTICE | 5 ++++-
server/native/src/main/resources/NOTICE | 5 +++++
3 files changed, 37 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/63544e84/LICENSE
----------------------------------------------------------------------
diff --cc LICENSE
index d433f05,e6497dd..1387085
--- a/LICENSE
+++ b/LICENSE
@@@ -256,40 -256,30 +256,68 @@@ under the following "3-clause BSD" lice
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.
++
+ The binary distribution of this product bundles slf4j, which is available
+ under the following MIT license:
+
+ Copyright (c) 2004-2013 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell 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
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ The binary distribution of the product bundles javax.servlet-api, which is
+ available under the CDDL 1.0 license (http://servlet-spec.java.net).
http://git-wip-us.apache.org/repos/asf/accumulo/blob/63544e84/NOTICE
----------------------------------------------------------------------
diff --cc NOTICE
index 72eb8c1,a3e5d7e..ed53f0c
--- a/NOTICE
+++ b/NOTICE
@@@ -7,34 -7,5 +7,37 @@@ The Apache Software Foundation (http://
This product includes JCommander (https://github.com/cbeust/jcommander),
Copyright 2010 Cedric Beust ced...@beust.com.
+ This product includes Jetty (http://eclipse.org/jetty),
+ Copyright 1995-2015 Mort Bay Consulting Pty Ltd.
++
+******************************************************************************
+
+Export Control
+
+This distribution includes cryptographic software. The country in which you
+currently reside may have restrictions on the import, possession, use, and/or
+re-export to another country, of encryption software. BEFORE using any
+encryption software, please check your country's laws, regulations and
+policies concerning the import, possession, or use, and re-export of
encryption
+software, to see if this is permitted. See <http://www.wassenaar.org/> for
more
+information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and Security
+(BIS), has classified this software as Export Commodity Control Number (ECCN)
+5D002.C.1, which includes information security software using or performing
+cryptographic functions with asymmetric algorithms. The form and manner of
this
+Apache Software Foundation distribution makes it eligible for export under
the
+License Exception ENC Technology Software Unrestricted (TSU) exception (see
the
+BIS Export Administration Regulations, Section 740.13) for both object code
and
+source code.
+
+The following provides more details on the included cryptographic software:
...
+
+Apache Accumulo uses the built-in java cryptography libraries in it's RFile
+encryption implementation. See
+http://www.oracle.com/us/products/export/export-regulations-345813.html
+for more details for on Java's cryptography features. Apache Accumulo also
uses
+the bouncycastle library for some crypographic technology as well. See
+http://www.bouncycastle.org/wiki/display/JA1/Frequently+Asked+Questions for
+more details on bouncycastle's cryptography features.
+
