hadoop/hadoop-common-project/hadoop-common/src/main
Zhe Zhang 6c17d31528 Merge remote-tracking branch 'apache/trunk' into HDFS-7285
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java

Change-Id: I53ec1c426dc988d6c4a2c87b00caef49c4057010
2015-09-30 08:39:13 -07:00
..
bin HADOOP-10854. unit tests for the shell scripts (aw) 2015-07-31 14:34:48 -07:00
conf HDFS-8953. DataNode Metrics logging (Contributed by Kanaka Kumar Avvaru) 2015-09-16 00:18:29 +05:30
java Merge remote-tracking branch 'apache/trunk' into HDFS-7285 2015-09-30 08:39:13 -07:00
native HADOOP-12302. Fix native compilation on Windows after HADOOP-7824 (Vinayakumar B via Colin P. McCabe) 2015-08-05 09:46:51 -07:00
proto HDFS-9080. Update htrace version to 4.0.1 (cmccabe) 2015-09-28 07:42:12 -07:00
resources HDFS-9080. Update htrace version to 4.0.1 (cmccabe) 2015-09-28 07:42:12 -07:00
webapps/static HDFS-4926. namenode webserver's page has a tooltip that is inconsistent with the datanode HTML link. Contributed by Vivek Ganesan. 2013-08-07 20:34:39 +00:00
winutils HADOOP-10356. Corrections in winutils/chmod.c (Contributed by René Nyffenegger) 2015-05-08 11:42:50 -07:00
xsl HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur. 2011-08-25 00:14:24 +00:00