Aaron Myers cd81cc6664 Merge trunk into HA branch. %!s(int64=13) %!d(string=hai) anos
..
ant cd7157784e HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur. %!s(int64=14) %!d(string=hai) anos
contrib 08bde10e24 Merge trunk into HA branch to pick up fix for bkjournal findbugs %!s(int64=13) %!d(string=hai) anos
main cd81cc6664 Merge trunk into HA branch. %!s(int64=13) %!d(string=hai) anos
test cd81cc6664 Merge trunk into HA branch. %!s(int64=13) %!d(string=hai) anos