cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Fri, 26 Jun 2015 18:43:31 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5698f4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5698f4e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5698f4e

Branch: refs/heads/cassandra-2.2
Commit: d5698f4ef5fd28a27b6b981e6e571ed610f8565b
Parents: 39c082f 5aaa5ca
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Fri Jun 26 13:32:17 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Fri Jun 26 13:32:17 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                    | 7 ++++---
 pylib/cqlshlib/cql3handling.py | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5698f4e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 498218e,68a9bf4..0611bac
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,12 +1,21 @@@
 -2.0.17
 +2.1.8
 + * Fix IndexOutOfBoundsException when inserting tuple with too many
 +   elements using the string literal notation (CASSANDRA-9559)
 + * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
 + * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
 + * Enable describe on indices (CASSANDRA-7814)
 + * ColumnFamilyStore.selectAndReference may block during compaction (CASSANDRA-9637)
 +Merged from 2.0
-   * Fix error message when attempting to create an index on a column
-     in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527)
-   * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565)
+  * (cqlsh) Add min_threshold to DTCS option autocomplete (CASSANDRA-9385)
+  * Fix error message when attempting to create an index on a column
+    in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527)
+  * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565)
 - * Display min timestamp in sstablemetadata viewer (CASSANDRA-6767)
  
  
 -2.0.16:
 +2.1.7
 + * Fix bug in cardinality check when compacting (CASSANDRA-9580)
 + * Fix memory leak in Ref due to ConcurrentLinkedQueue.remove() behaviour (CASSANDRA-9549)
 +Merged from 2.0
   * Expose some internals of SelectStatement for inspection (CASSANDRA-9532)
   * ArrivalWindow should use primitives (CASSANDRA-9496)
   * Periodically submit background compaction tasks (CASSANDRA-9592)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5698f4e/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------


Mime
View raw message