Merge branch '1.7' into 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/e8118511
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e8118511
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e8118511
Branch: refs/heads/1.8
Commit: e81185117335a38356afb787197409350e730363
Parents: 08d279f 3aecf0a
Author: Sean Busbey <bus...@cloudera.com>
Authored: Fri Jun 17 15:55:17 2016 -0500
Committer: Sean Busbey <bus...@cloudera.com>
Committed: Fri Jun 17 15:55:17 2016 -0500
----------------------------------------------------------------------
NOTICE | 30 ------------------------------
README.md | 34 +++++++++++++++++++++++++++++++++-
2 files changed, 33 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e8118511/README.md
----------------------------------------------------------------------
diff --cc README.md
index eda81ce,a62df38..f56527b
--- a/README.md
+++ b/README.md
@@@ -97,19 -101,46 +97,51 @@@ The Accumulo project maintains binary c
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]
- [1]: https://accumulo.apache.org
+ 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]: http://research.google.com/archive/bigtable.html
-[5]: http://hadoop.apache.org
-[6]: http://zookeeper.apache.org
-[7]: http://thrift.apache.org/
-[8]: http://accumulo.apache.org/notable_features.html
-[9]: http://maven.apache.org/
-[12]: http://semver.org/spec/v2.0.0.html
+[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
+ [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
