Kihwal Lee 3d3ed41d28 svn merge -c 1510581 Merging from trunk to branch-2.1-beta to fix MAPREDUCE-5446. TestJobHistoryEvents and TestJobHistoryParsing have race conditions. %!s(int64=12) %!d(string=hai) anos
..
main 3a0185f950 svn merge -c 1499425 FIXES: MAPREDUCE-5358. MRAppMaster throws invalid transitions for JobImpl. Contributed by Devaraj K %!s(int64=12) %!d(string=hai) anos
test 3d3ed41d28 svn merge -c 1510581 Merging from trunk to branch-2.1-beta to fix MAPREDUCE-5446. TestJobHistoryEvents and TestJobHistoryParsing have race conditions. %!s(int64=12) %!d(string=hai) anos