Todd Lipcon 6f2aae046d Resolve trivial compilation error after previous merge ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1324570 13f79535-47bb-0310-9956-ffa450edef68		2012-04-11 05:52:31 +00:00
..
bin	HADOOP-8247. Add a config to enable auto-HA, which disables manual FailoverController. Contributed by Todd Lipcon.	2012-04-11 05:40:26 +00:00
conf
docs
java	Resolve trivial compilation error after previous merge	2012-04-11 05:52:31 +00:00
native
packages
proto	Merge trunk into auto-failover branch.	2012-04-11 05:47:40 +00:00
resources
webapps
xsl