Skip to content
Browse files

Merge branch 'cassandra-2.1' into trunk

  • Loading branch information...
2 parents 572d328 + 5310f26 commit baa2b692db781c46170b707cdc5cafd033ac42b0 @mebigfatguy mebigfatguy committed
Showing with 26 additions and 1 deletion.
  1. +19 −0 NEWS.txt
  2. +6 −0 debian/changelog
  3. +1 −1 src/java/org/apache/cassandra/tools/NodeProbe.java
View
19 NEWS.txt
@@ -62,6 +62,25 @@ Upgrading
has been deprecated.
+2.0.6
+=====
+
+New features
+------------
+ - CQL now support static columns, allows to batch multiple conditional updates
+ and has a new syntax for slicing over multiple clustering columns
+ (http://goo.gl/B6qz4j).
+ - Repair can be restricted to a set of nodes using the -hosts option in nodetool.
+ - A new 'nodetool taketoken' command relocate tokens with vnodes.
+ - Hinted handoff can be enabled only for some data-centers (see
+ hinted_handoff_enabled in cassandra.yaml)
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see 2.0.6 if you are upgrading
+ from a previous version.
+
+
2.0.5
=====
View
6 debian/changelog
@@ -4,6 +4,12 @@ cassandra (2.1.0~beta1) unstable; urgency=low
-- Sylvain Lebresne <slebresne@apache.org> Mon, 17 Feb 2014 16:50:33 +0100
+cassandra (2.0.6) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org> Fri, 07 Mar 2014 13:18:42 +0100
+
cassandra (2.0.5) unstable; urgency=low
* New release
View
2 src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -1137,7 +1137,7 @@ public int compare(Entry<String, ColumnFamilyStoreMBean> e1, Entry<String, Colum
// get CF name and split it for index name
String e1CF[] = e1.getValue().getColumnFamilyName().split("\\.");
- String e2CF[] = e1.getValue().getColumnFamilyName().split("\\.");
+ String e2CF[] = e2.getValue().getColumnFamilyName().split("\\.");
assert e1CF.length <= 2 && e2CF.length <= 2 : "unexpected split count for column family name";
//if neither are indexes, just compare CF names

0 comments on commit baa2b69

Please sign in to comment.
Something went wrong with that request. Please try again.