Arpit Agarwal 59393e0162 Merging r1543613 through r1543709 from trunk to branch HDFS-2832 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1543710 13f79535-47bb-0310-9956-ffa450edef68		2013-11-20 05:31:02 +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 r1543613 through r1543709 from trunk to branch HDFS-2832	2013-11-20 05:31:02 +00:00
native	HDFS-5365. Fix libhdfs compile error on FreeBSD9. Contributed by Radim Kolar.	2013-10-17 23:05:44 +00:00
proto	merge r1535792 through r1541341 from trunk.	2013-11-13 01:14:37 +00:00
resources	HDFS-5440. Extract the logic of handling delegation tokens in HftpFileSystem to the TokenAspect class. Contributed by Haohui Mai.	2013-11-13 19:25:09 +00:00
webapps	HDFS-5393. Serve bootstrap and jQuery locally. Contributed by Haohui Mai.	2013-11-19 00:37:54 +00:00
xsl