hadoop/hadoop-common-project/hadoop-common/src/main
arp e0d7fb48fb Merge branch 'trunk' into HDFS-6581
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/Receiver.java
2014-09-16 14:32:57 -07:00
..
bin HADOOP-11055. non-daemon pid files are missing (aw) 2014-09-16 14:11:15 -07:00
conf YARN-2529. Generic history service RPC interface doesn't work when service authorization is enabled. Contributed by Zhijie Shen 2014-09-15 13:13:54 -07:00
docs
java Merge branch 'trunk' into HDFS-6581 2014-09-15 15:30:19 -07:00
native HDFS-6912. SharedFileDescriptorFactory should not allocate sparse files (cmccabe) 2014-09-15 14:47:27 -07:00
proto HDFS-6879. Adding tracing to Hadoop RPC. Contributed by Masatake Iwasaki. 2014-08-27 14:12:05 -07:00
resources HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang. 2014-09-15 08:27:07 -07:00
webapps/static
winutils
xsl