Chris Nauroth 909eb7e4f1 Merge trunk to HDFS-4685. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1569833 13f79535-47bb-0310-9956-ffa450edef68		2014-02-19 17:24:02 +00:00
..
bin	HDFS-5698. Use protobuf to serialize / deserialize FSImage. Contributed by Haohui Mai.	2014-02-09 19:18:51 +00:00
conf	HADOOP-8913. hadoop-metrics2.properties should give units in comment for sampling period. Contributed by Sandy Ryza.	2012-10-11 05:17:03 +00:00
docs	Merge trunk into branch.	2013-03-29 21:33:35 +00:00
java	Merge trunk to HDFS-4685.	2014-02-19 17:24:02 +00:00
native	HDFS-5756. hadoopRzOptionsSetByteBufferPool does not accept NULL argument, contrary to docs. Contributed by Colin Patrick McCabe.	2014-01-10 20:10:44 +00:00
proto	Merge trunk to HDFS-4685.	2014-02-13 18:21:46 +00:00
resources	Merge trunk to HDFS-4685.	2014-02-13 20:19:53 +00:00
webapps	HDFS-5749. Web UI does not show up during the period of loading FSImage. (Contributed by Haohui Mai)	2014-02-15 01:20:19 +00:00
xsl	HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.	2011-08-25 00:14:24 +00:00