HDFS-5719. FSImage#doRollback() should close prevState before return. Contributed by Ted Yu

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556057 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-3310. Addendum fixing javadocs warnings (tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556063 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10201. Add listing to KeyProvider API. (Larry McCay via omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556072 13f79535-47bb-0310-9956-ffa450edef68
HDFS-2832. Update CHANGES.txt to reflect merge to branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556088 13f79535-47bb-0310-9956-ffa450edef68
YARN-1029. Added embedded leader election in the ResourceManager. Contributed by Karthik Kambatla.


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