Kihwal Lee d69d0eafdf Fix merge error. %!s(int64=11) %!d(string=hai) anos
..
bin fc12b892cb HDFS-6157. Merge r1582100 from 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 d69d0eafdf Fix merge error. %!s(int64=11) %!d(string=hai) anos
native d75589380f HDFS-6065. HDFS zero-copy reads should return null on EOF when doing ZCR (cmccabe) %!s(int64=11) %!d(string=hai) anos
proto abab3da53d HDFS-5138. Merge change r1581067 from branch-2. %!s(int64=11) %!d(string=hai) anos
resources 5bfab698e9 HDFS-5190: Merging 1581690 from branch-2 to branch-2.4. %!s(int64=11) %!d(string=hai) anos
webapps 85ca17b33e HDFS-6326. WebHdfs ACL compatibility is broken. Contributed by Chris Nauroth. %!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