cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Date Sun, 24 Nov 2013 18:56:28 GMT
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: f69e043ce4a4c8ecba6682fcd7ddf771a773afea
Parents: dc95675 5eaa216
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Sun Nov 24 21:55:26 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sun Nov 24 21:55:26 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                  | 2 ++
 pylib/cqlshlib/formatting.py | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f69e043c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index eb0bc91,34dc7a5..ef3aa17
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,9 +1,25 @@@
 +2.1
 + * allocate fixed index summary memory pool and resample cold index summaries 
 +   to use less memory (CASSANDRA-5519)
 + * Removed multithreaded compaction (CASSANDRA-6142)
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 + * Remove CFDefinition (CASSANDRA-6253)
 + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
 + * User-defined types for CQL3 (CASSANDRA-5590)
 + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871)
 + * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
 +
 +
  2.0.4
 - * Fix divide-by-zero in PCI (CASSANDRA-6403)
   * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
   * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395)
+ Merged from 1.2:
+  * cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172)
  
  
  2.0.3


Mime
View raw message