On Fri, Feb 3, 2012 at 6:45 PM, Suresh Srinivas <sur...@hortonworks.com>wrote:
> Todd, can you please hold off for the merge till Tuesday, until some of the > other folks working on HA could catch up with some of the recent changes. > Note that this merge doesn't have anything to do with any *recent* changes to the HA branch. The conflicts with HDFS-2718 are from HDFS-2602, which was committed back in December. -- Aaron T. Myers Software Engineer, Cloudera