Jason Lowe 5bd40d7099 YARN-4344. NMs reconnecting with changed capabilities can lead to wrong cluster resource calculations. Contributed by Varun Vasudev
(cherry picked from commit d36b6e045f317c94e97cb41a163aa974d161a404)

Conflicts:

	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java
2015-11-23 20:47:12 +00:00
..
2015-11-03 15:18:10 -08:00