Merge remote branch 'abelaska/master' into 0.6.0

rantav · Sep 27, 2010 · 0556ecc · 0556ecc
2 parents de42c13 + dc1e648
commit 0556ecc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 .DS_Store
 hector.iml
 releases
+target/
diff --git a/lib/apache-cassandra-0.6.0.jar b/lib/apache-cassandra-0.6.0.jar
diff --git a/lib/apache-cassandra-0.6.5.jar b/lib/apache-cassandra-0.6.5.jar
diff --git a/pom.xml b/pom.xml
@@ -192,8 +192,8 @@
               <packaging>jar</packaging>
               <groupId>org.apache.cassandra</groupId>
               <artifactId>cassandra</artifactId>
-              <version>0.6.0</version>
-              <file>${basedir}/lib/apache-cassandra-0.6.0.jar</file>
+              <version>0.6.5</version>
+              <file>${basedir}/lib/apache-cassandra-0.6.5.jar</file>
             </configuration>
           </execution>
           <execution>
@@ -255,7 +255,7 @@
     <dependency>
       <groupId>org.apache.cassandra</groupId>
       <artifactId>cassandra</artifactId>
-      <version>0.6.0</version>
+      <version>0.6.5</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/src/test/java/me/prettyprint/cassandra/service/CassandraClusterTest.java b/src/test/java/me/prettyprint/cassandra/service/CassandraClusterTest.java
@@ -48,7 +48,7 @@ public void testDescribeClusterName() throws Exception {
    */
   @Test
   public void testDescribeThriftVersion() throws Exception {
-    assertEquals("2.1.0",cassandraCluster.describeThriftVersion());
+    assertEquals("2.2.0",cassandraCluster.describeThriftVersion());
   }
 
   @Test