Go to file
Zhe Zhang 8fd5520246 Merge remote-tracking branch 'apache/trunk' into HDFS-7285
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirStatAndListingOp.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockTokenWithDFS.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java

Change-Id: Ic7946c4ea35bed587fe879ce58b959b25ecc0823
2015-09-29 01:39:16 -07:00
dev-support HADOOP-11984. Enable parallel JUnit tests in pre-commit (Contributed by Chris Nauroth) 2015-09-27 14:12:07 +05:30
hadoop-assemblies MAPREDUCE-6415. Create a tool to combine aggregated logs into HAR files. (Robert Kanter via kasha) 2015-09-09 17:45:19 -07:00
hadoop-build-tools HADOOP-11900. Add failIfNoTests=false to hadoop-build-tools pom. (gera) 2015-05-01 18:18:55 -07:00
hadoop-client HADOOP-9905. remove dependency of zookeeper for hadoop-client (Contributed by Vinayakumar B) 2015-06-01 17:47:02 +05:30
hadoop-common-project Merge remote-tracking branch 'apache/trunk' into HDFS-7285 2015-09-29 01:39:16 -07:00
hadoop-dist HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash. (wang) 2015-05-29 14:54:18 -07:00
hadoop-hdfs-project Merge remote-tracking branch 'apache/trunk' into HDFS-7285 2015-09-29 01:39:16 -07:00
hadoop-mapreduce-project MAPREDUCE-6492. AsyncDispatcher exit with NPE on TaskAttemptImpl#sendJHStartEventForAssignedFailTask. Contributed by Bibin A Chundatt 2015-09-28 22:12:03 +00:00
hadoop-maven-plugins HADOOP-12194. Support for incremental generation in the protoc plugin. 2015-07-08 11:09:43 -07:00
hadoop-minicluster HADOOP-11412 POMs mention "The Apache Software License" rather than "Apache License". (Herve Boutemy via stevel) 2014-12-16 11:04:36 +00:00
hadoop-project Merge remote-tracking branch 'apache/trunk' into HDFS-7285 2015-09-29 01:39:16 -07:00
hadoop-project-dist HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash. (wang) 2015-05-29 14:54:18 -07:00
hadoop-tools HADOOP-12446. Undeprecate createNonRecursive(). Contributed by Ted Yu. 2015-09-28 17:31:51 -05:00
hadoop-yarn-project YARN-4180. AMLauncher does not retry on failures when talking to NM. (adhoot) 2015-09-28 16:13:41 -07:00
.gitattributes HADOOP-10040. svn propset to native line endings on Windows files. Contributed by Chris Nauroth. 2013-10-14 17:13:38 +00:00
.gitignore HADOOP-12059. S3Credentials should support use of CredentialProvider. Contributed by Sean Busbey. 2015-06-05 13:11:01 -07:00
BUILDING.txt HADOOP-12274. Remove direct download link from BULIDING.txt. Contributed by Caleb Severn. 2015-08-05 17:45:55 +09:00
LICENSE.txt HADOOP-11184. Update Hadoop's lz4 to r123 (cmccabe) 2014-10-09 17:05:35 -07:00
NOTICE.txt HADOOP-10956. Fix create-release script to include docs and necessary txt files. (kasha) 2014-09-03 09:39:02 -07:00
pom.xml HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash. (wang) 2015-05-29 14:54:18 -07:00
README.txt HADOOP-10956. Fix create-release script to include docs and necessary txt files. (kasha) 2014-09-03 09:39:02 -07:00
start-build-env.sh HADOOP-11936. Dockerfile references a removed image (aw) 2015-05-07 11:46:32 -07:00

For the latest information about Hadoop, please visit our website at:

   http://hadoop.apache.org/core/

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 <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:
  Hadoop Core uses the SSL libraries from the Jetty project written 
by mortbay.org.