Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@accumulo.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: busbey@apache.org
To: commits@accumulo.apache.org
Date: Fri, 17 Jun 2016 20:58:07 -0000
Message-Id: <d346e7b6c21e47179fd543e3fa2f1366@git.apache.org>
In-Reply-To: <1962e57cc60649cc855351505b1b925e@git.apache.org>
References: <1962e57cc60649cc855351505b1b925e@git.apache.org>
Subject: [6/6] accumulo git commit: Merge branch '1.8'
archived-at: Fri, 17 Jun 2016 20:58:04 -0000

Merge branch '1.8'

 Conflicts:
	README.md


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/04579f61
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04579f61
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/04579f61

Branch: refs/heads/master
Commit: 04579f6106cfe6062025dc72044acd6ea3d68683
Parents: 2b5b54b e811851
Author: Sean Busbey <busbey@cloudera.com>
Authored: Fri Jun 17 15:57:22 2016 -0500
Committer: Sean Busbey <busbey@cloudera.com>
Committed: Fri Jun 17 15:57:22 2016 -0500

----------------------------------------------------------------------
 NOTICE    | 30 ------------------------------
 README.md | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/04579f61/README.md
----------------------------------------------------------------------
diff --cc README.md
index f575b94,f56527b..4269001
--- a/README.md
+++ b/README.md
@@@ -97,30 -95,53 +97,62 @@@ import\s+org\.apache\.accumulo\.(.*\.(i
  
  The Accumulo project maintains binary compatibility across this API within a
  major release, as defined in the Java Language Specification 3rd ed. Starting
 -with Accumulo 1.6.2 and 1.7.0 all API changes will follow [semver 2.0][12]
 +with Accumulo 1.6.2 and 1.7.0 all API changes will follow [semver 2.0][semver]
  
+ 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 its RFile
+ encryption implementation. See [oracle's export-regulations doc][java-export]
+ for more details for on Java's cryptography features. Apache Accumulo also uses
+ the bouncycastle library for some crypographic technology as well. See
+ [the BouncyCastle FAQ][bouncy-faq] for
+ more details on bouncycastle's cryptography features.
+ 
+ 
 -[1]: http://accumulo.apache.org
 -[2]: INSTALL.md
 -[3]: TESTING.md
 -[4]: https://research.google.com/archive/bigtable.html
 -[5]: https://hadoop.apache.org
 -[6]: https://zookeeper.apache.org
 -[7]: https://thrift.apache.org
 -[8]: https://accumulo.apache.org/notable_features
 -[9]: https://maven.apache.org
 -[10]: https://accumulo.apache.org/latest/accumulo_user_manual
 -[11]: https://accumulo.apache.org/latest/examples
 -[12]: http://semver.org/spec/v2.0.0
 -[13]: http://checkstyle.sourceforge.net/config_regexp.html
 -[14]: examples/simple/src/main/java/org/apache/accumulo/examples/simple
 -[15]: docs/src/main/resources/examples
 -[16]: docs/src/main/asciidoc
 +[accumulo]: https://accumulo.apache.org
 +[logo]: contrib/accumulo-logo.png
 +[install]: INSTALL.md
 +[test]: TESTING.md
 +[BigTable]: https://research.google.com/archive/bigtable.html
 +[Hadoop]: https://hadoop.apache.org
 +[Zookeeper]: https://zookeeper.apache.org
 +[Thrift]: https://thrift.apache.org
 +[features]: https://accumulo.apache.org/notable_features
 +[Maven]: https://maven.apache.org
 +[man-web]: https://accumulo.apache.org/latest/accumulo_user_manual
 +[ex-web]: https://accumulo.apache.org/latest/examples
 +[semver]: http://semver.org/spec/v2.0.0
 +[regex]: http://checkstyle.sourceforge.net/config_regexp.html
 +[ex-src]: examples/simple/src/main/java/org/apache/accumulo/examples/simple
 +[rm-src]: docs/src/main/resources/examples
 +[man-src]: docs/src/main/asciidoc
 +[li]: https://img.shields.io/badge/license-ASL-blue.svg
 +[ll]: https://www.apache.org/licenses/LICENSE-2.0
 +[mi]: https://maven-badges.herokuapp.com/maven-central/org.apache.accumulo/accumulo-core/badge.svg
 +[ml]: https://maven-badges.herokuapp.com/maven-central/org.apache.accumulo/accumulo-core/
 +[ji]: https://javadoc-emblem.rhcloud.com/doc/org.apache.accumulo/accumulo-core/badge.svg
 +[jl]: https://www.javadoc.io/doc/org.apache.accumulo/accumulo-core
 +[ti]: https://travis-ci.org/apache/accumulo.svg?branch=master
 +[tl]: https://travis-ci.org/apache/accumulo
+ [java-export]: http://www.oracle.com/us/products/export/export-regulations-345813.html
+ [bouncy-faq]: http://www.bouncycastle.org/wiki/display/JA1/Frequently+Asked+Questions