cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Date Fri, 29 Nov 2013 02:27:48 GMT
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 2ddf2cdc68226cab90df0e9e492908d11f699590
Parents: 58bcdd4 d41a746
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Nov 29 05:27:35 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Nov 29 05:27:35 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                                             |  1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 12 ++++++++++++
 .../apache/cassandra/metrics/ColumnFamilyMetrics.java   |  9 +++++++++
 3 files changed, 22 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ddf2cdc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a8ddb87,644c6b3..8d11a0a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,8 +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, 6406)
 + * 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)
 + * Add snapshot space used to cfstats (CASSANDRA-6231)
+  * Expose a total memtable size metric for a CF (CASSANDRA-6391)
  Merged from 1.2:
   * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345)
   * cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ddf2cdc/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ddf2cdc/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------


Mime
View raw message