commit a47c3018a47c2a2cb0eb0fa960ac7defb147b187
author Jonathan Hart <jono@onlab.us> Fri Feb 01 11:28:17 2013 -0800
committer Jonathan Hart <jono@onlab.us> Fri Feb 01 11:28:17 2013 -0800
tree 542f44e7f3c31729444afb2f7a887545ddfa63e2
parent 5024ec1433e20205383bbcd1f52e74382115707e

Resolved a conflict resulting from having two different versions of concurrentlinkedhashmap-lru on the classpath. I removed version 1.2 and moved version 1.3 to lib/concurrentlinkedhashmap-lru-1.3.jar

build.xml

diff --git a/build.xml b/build.xml
index aa8b593..2bd1343 100644
--- a/build.xml
+++ b/build.xml
@@ -62,7 +62,7 @@
         <include name="simple-4.1.21.jar"/>
         <include name="netty-3.2.6.Final.jar"/>
         <include name="args4j-2.0.16.jar"/>
-        <include name="concurrentlinkedhashmap-lru-1.2.jar"/>
+        <include name="concurrentlinkedhashmap-lru-1.3.jar"/>
         <include name="jython-2.5.2.jar"/>
         <include name="libthrift-0.7.0.jar"/>
     </patternset>