Arpit Agarwal 103fd6c6d8 Merging r1538408 through r1539244 from trunk to branch HDFS-2832 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539245 13f79535-47bb-0310-9956-ffa450edef68		2013-11-06 06:14:13 +00:00
..
bin	Merge HDFS-4949 branch back into trunk	2013-10-29 00:49:20 +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	Merging r1538408 through r1539244 from trunk to branch HDFS-2832	2013-11-06 06:14:13 +00:00
native	HDFS-5365. Fix libhdfs compile error on FreeBSD9. Contributed by Radim Kolar.	2013-10-17 23:05:44 +00:00
proto	Merging r1536572 from trunk to branch HDFS-2832	2013-10-29 21:04:31 +00:00
resources	HDFS-5037. Active NN should trigger its own edit log rolls. Contributed by Andrew Wang.	2013-11-01 20:49:54 +00:00
webapps	HDFS-5382. Implement the UI of browsing filesystems in HTML 5 page. Contributed by Haohui Mai.	2013-10-21 20:42:13 +00:00
xsl