Jing Zhao 5736c7ad1b Merge change r1558255 (HDFS-5704) and r1558675 (HDFS-5777) to branch-2: Change OP_UPDATE_BLOCKS with a new OP_ADD_BLOCK,and update the LayoutVersion %!s(int64=11) %!d(string=hai) anos
..
dev-support 6896eea01b HDFS-3050. svn merge -c 1309629 from trunk %!s(int64=13) %!d(string=hai) anos
hadoop-hdfs 5736c7ad1b Merge change r1558255 (HDFS-5704) and r1558675 (HDFS-5777) to branch-2: Change OP_UPDATE_BLOCKS with a new OP_ADD_BLOCK,and update the LayoutVersion %!s(int64=11) %!d(string=hai) anos
hadoop-hdfs-httpfs 439a690ad1 Setting version to 2.4.0-SNAPSHOT in branch-2. %!s(int64=11) %!d(string=hai) anos
hadoop-hdfs-nfs 531605ef28 HDFS-5649. Merging change 1556405 from trunk %!s(int64=11) %!d(string=hai) anos
pom.xml 439a690ad1 Setting version to 2.4.0-SNAPSHOT in branch-2. %!s(int64=11) %!d(string=hai) anos