Andrew Wang 4cc2f50e5f HADOOP-10255. Rename HttpServer to HttpServer2 to retain older HttpServer in branch-2 for compatibility. Merged from r1561966 in branch-2. %!s(int64=11) %!d(string=hai) anos
..
main ad6f4b9809 MAPREDUCE-5464. Add analogs of the SLOTS_MILLIS counters that jive with the YARN resource model (Sandy Ryza) %!s(int64=11) %!d(string=hai) anos
test 4cc2f50e5f HADOOP-10255. Rename HttpServer to HttpServer2 to retain older HttpServer in branch-2 for compatibility. Merged from r1561966 in branch-2. %!s(int64=11) %!d(string=hai) anos