This patch removes one of the duplicates.

+1 overall. Here are the results of testing the latest attachment
http://issues.apache.org/jira/secure/attachment/12428137/ZOOKEEPER-630.patch
against trunk revision 891034.

+1 @author. The patch does not contain any @author tags.

+1 tests included. The patch appears to include 2 new or modified tests.

+1 javadoc. The javadoc tool did not generate any warning messages.

+1 javac. The applied patch does not increase the total number of javac compiler warnings.

+1 findbugs. The patch does not introduce any new Findbugs warnings.

+1 release audit. The applied patch does not increase the total number of release audit warnings.

+1 core tests. The patch passed core unit tests.

+1 contrib tests. The patch passed contrib unit tests.

Test results: http://hudson.zones.apache.org/hudson/job/Zookeeper-Patch-h8.grid.sp2.yahoo.net/89/testReport/
Findbugs warnings: http://hudson.zones.apache.org/hudson/job/Zookeeper-Patch-h8.grid.sp2.yahoo.net/89/artifact/trunk/build/test/findbugs/newPatchFindbugsWarnings.html
Console output: http://hudson.zones.apache.org/hudson/job/Zookeeper-Patch-h8.grid.sp2.yahoo.net/89/console

This message is automatically generated.

When you say duplicate you mean that the other file contains the same set of tests? What I mean is, we aren't effectively removing tests as part of this patch, is that right?

That's what I mean, yes. Same set of tests (although now slightly different since Flavio's patch updated the one I left in), no logical test removal.

Except there's one test that should have been removed, which wasn't removed in the duplicate (the test to make sure that an exception is thrown if the wrong LE algorithm is used - this is no longer appropriate). So we are removing that test, but it should be removed anyhow.

+1 thanks Henry

Integrated in ZooKeeper-trunk #632 (See http://hudson.zones.apache.org/hudson/job/ZooKeeper-trunk/632/)