hadoop git commit: YARN-4344. NMs reconnecting with changed capabilities can lead to wrong cluster resource calculations. Contributed by Varun Vasudev (cherry picked from commit d36b6e045f317c94e97cb4

2015-11-23 Thread jlowe
Repository: hadoop Updated Branches: refs/heads/branch-2.7 f62cdc38f -> 5bd40d709 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 git commit: YARN-4344. NMs reconnecting with changed capabilities can lead to wrong cluster resource calculations. Contributed by Varun Vasudev (cherry picked from commit d36b6e045f317c94e97cb4

2015-11-23 Thread jlowe
Repository: hadoop Updated Branches: refs/heads/branch-2 d469e9e4c -> 9d303edbf YARN-4344. NMs reconnecting with changed capabilities can lead to wrong cluster resource calculations. Contributed by Varun Vasudev (cherry picked from commit d36b6e045f317c94e97cb41a163aa974d161a404) Project: ht