Jing Zhao b2fcad6d36 HDFS-5334. Merge change r1532949 from trunk. %!s(int64=11) %!d(string=hai) anos
..
bin 4e4e958213 HADOOP-10040. Merging change r1531977 from trunk to branch-2. %!s(int64=11) %!d(string=hai) anos
conf 93a18b3cd6 HADOOP-8913. Merging change 1396904 from trunk %!s(int64=12) %!d(string=hai) anos
docs a1235b5ba9 HADOOP-8562. Merge r1453486 from trunk %!s(int64=12) %!d(string=hai) anos
java 0b18a51c33 svn merge -c 1532932 from trunk for HDFS-4376. Fix race conditions in Balancer. %!s(int64=11) %!d(string=hai) anos
native f040bd0739 HDFS-5260. Merging change r1527113 from trunk to branch-2. %!s(int64=11) %!d(string=hai) anos
proto 3bb402c70f HDFS-5306. Merging change r1529562 from trunk %!s(int64=11) %!d(string=hai) anos
resources ce9da0e32c svn merge -c 1532468 from trunk for HDFS-5338. Add a conf to disable hostname check in datanode registration. %!s(int64=11) %!d(string=hai) anos
webapps b2fcad6d36 HDFS-5334. Merge change r1532949 from trunk. %!s(int64=11) %!d(string=hai) anos
xsl cd7157784e HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur. %!s(int64=13) %!d(string=hai) anos