Todd Lipcon 30068a1d83 Merge trunk into auto-failover branch.
Addressed two semantic conflicts after the commit of HADOOP-8077 -- test code was referencing the old constant for the fencing methods config key.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1310174 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 05:07:33 +00:00
..