Tsz-wo Sze 99b4caa888 Merge r1555021 through r1569522 from trunk. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1569524 13f79535-47bb-0310-9956-ffa450edef68		2014-02-18 20:42:26 +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 r1555021 through r1569522 from trunk.	2014-02-18 20:42:26 +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	HDFS-5945. Add rolling upgrade information to fsimage; and disallow upgrade and rolling upgrade to be started simultaneously. Contributed by szetszwo & jing9	2014-02-18 20:12:17 +00:00
resources	HDFS-5941. add dfs.namenode.secondary.https-address and dfs.namenode.secondary.https-address in hdfs-default.xml. Contributed by Haohui Mai.	2014-02-13 19:53:20 +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