YARN-245. Fixed NodeManager to handle duplicate responses from ResourceManager. Contributed by Mayank Bansal.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1508157 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5027. On startup, DN should scan volumes in parallel. Contributed by Aaron T. Myers.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1508165 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch upstream/$:{upbranch}