<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -89,6 +89,9 @@ Trunk (unreleased changes)
     HADOOP-2908.  A document that describes the DFS Shell command. 
     (Mahadev Konar via dhruba)
 
+    HADOOP-2981.  Update README.txt to reflect the upcoming use of
+    cryptography. (omalley)
+
   OPTIMIZATIONS
 
     HADOOP-2790.  Fixed inefficient method hasSpeculativeTask by removing</diff>
      <filename>CHANGES.txt</filename>
    </modified>
    <modified>
      <diff>@@ -5,3 +5,27 @@ For the latest information about Hadoop, please visit our website at:
 and our wiki, at:
 
    http://wiki.apache.org/hadoop/
+
+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 &lt;http://www.wassenaar.org/&gt; 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:
+  Hadoop Core uses the SSL libraries from the Jetty project written 
+by mortbay.org.</diff>
      <filename>README.txt</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>8c6dc1ccf1693ce729ab7d7dd823ac702dc9f86d</id>
    </parent>
  </parents>
  <author>
    <name>Owen O'Malley</name>
    <email>omalley@apache.org</email>
  </author>
  <url>http://github.com/yahoo/hadoop/commit/5d67ca06eae6f6cd31412da7d3a1d75d7c577692</url>
  <id>5d67ca06eae6f6cd31412da7d3a1d75d7c577692</id>
  <committed-date>2008-03-13T20:03:47-07:00</committed-date>
  <authored-date>2008-03-13T20:03:47-07:00</authored-date>
  <message>HADOOP-2981.  Update README.txt to reflect the upcoming inclusion on 
cryptography.


git-svn-id: https://svn.eu.apache.org/repos/asf/hadoop/core/trunk@636973 13f79535-47bb-0310-9956-ffa450edef68</message>
  <tree>039064413ff4c7806e2496c8e8d2ee378833b5de</tree>
  <committer>
    <name>Owen O'Malley</name>
    <email>omalley@apache.org</email>
  </committer>
</commit>
