cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [8/9] git commit: merge from 1.2
Date Wed, 25 Sep 2013 01:51:39 GMT
merge from 1.2


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

Branch: refs/heads/cassandra-2.0
Commit: a06a138385442084e37a039adeafdfb5889101ef
Parents: 07638f4 16f19a7
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Sep 24 20:50:40 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Sep 24 20:50:40 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                            | 1 +
 src/java/org/apache/cassandra/db/Memtable.java         | 4 +---
 src/java/org/apache/cassandra/utils/Allocator.java     | 2 --
 src/java/org/apache/cassandra/utils/HeapAllocator.java | 5 -----
 src/java/org/apache/cassandra/utils/SlabAllocator.java | 8 --------
 5 files changed, 2 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a06a1383/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 830f568,6341e29..fe4efc7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 -1.2.11
 +2.0.2
 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
 + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
 + * Fix insertion of collections with CAS (CASSANDRA-6069)
 + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
 + * Track clients' remote addresses in ClientState (CASSANDRA-6070)
 +Merged from 1.2:
+  * Allow estimated memtable size to exceed slab allocator size (CASSANDRA-6078)
   * Start MeteredFlusher earlier to prevent OOM during CL replay (CASSANDRA-6087)
   * Avoid sending Truncate command to fat clients (CASSANDRA-6088)
   * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a06a1383/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a06a1383/src/java/org/apache/cassandra/utils/SlabAllocator.java
----------------------------------------------------------------------


Mime
View raw message