Chris Nauroth cf3ac1a59e YARN-1138. Merging change r1556978 from trunk to branch-2. %!s(int64=11) %!d(string=hai) anos
..
main 6ce1f14fed MAPREDUCE-5616. Merging change r1542001 from trunk to branch-2. %!s(int64=11) %!d(string=hai) anos
test cf3ac1a59e YARN-1138. Merging change r1556978 from trunk to branch-2. %!s(int64=11) %!d(string=hai) anos