commit 5f36b62265ee4331f1c597f6031e623cd0e44c68
author Junping Du <jdu@jduMBP.local> Wed Dec 28 17:37:20 2016 -0800
committer Junping Du <jdu@jduMBP.local> Wed Dec 28 17:37:20 2016 -0800
tree ba2b71f1052bac1b36327411e2baadbd0946d091
parent 8755a6f5ac6785d6ed521555a2187389360bac42

Revert "MAPREDUCE-5875. Make Counter limits consistent across JobClient, MRAppMaster, and YarnChild. (Gera Shegalov via kasha)"

This reverts commit 7bfd9e068d205f752c05d51778a4a4702329d31e.

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/HistoryViewer.java
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java