Fixing merge errors
authorSteve Singer <ssinger@ca.afilias.info>
Fri, 3 Feb 2012 14:50:29 +0000 (09:50 -0500)
committerSteve Singer <ssinger@ca.afilias.info>
Fri, 3 Feb 2012 14:50:29 +0000 (09:50 -0500)
commit9f27a899076fe4464f292eae779baf394e34414f
tree7f658aac97abcbf310b0827764a089a7242d3caa
parent5e625828d1aefdeabd4ac1e138f54f8aae686f2b
Fixing merge errors
clustertest/disorder/tests/Failover.js