Alejandro Abdelnur e98fdc037c Merge -r 1242986:1242987 from trunk to branch. FIXES: HADOOP-8051 13 lat temu
..
main 4132e3991e Merge -r 1236928:1236929 from trunk to branch. FIXES: HADOOP-7939 13 lat temu
site e98fdc037c Merge -r 1242986:1242987 from trunk to branch. FIXES: HADOOP-8051 13 lat temu
test 56b07f1ab2 Merge -r 1236939:1236940 from trunk to branch. FIXES: HDFS-2840 13 lat temu