Alejandro Abdelnur 56b07f1ab2 Merge -r 1236939:1236940 from trunk to branch. FIXES: HDFS-2840 %!s(int64=13) %!d(string=hai) anos
..
main 4132e3991e Merge -r 1236928:1236929 from trunk to branch. FIXES: HADOOP-7939 %!s(int64=13) %!d(string=hai) anos
site 24e3d83445 Merge -r 1212059:1212060 from trunk to branch. FIXES: HDFS-2178 %!s(int64=13) %!d(string=hai) anos
test 56b07f1ab2 Merge -r 1236939:1236940 from trunk to branch. FIXES: HDFS-2840 %!s(int64=13) %!d(string=hai) anos