cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/10] git commit: Merge branch 'cassandra-1.1' into trunk
Date Fri, 04 May 2012 23:10:28 GMT
Updated Branches:
  refs/heads/cassandra-1.1 44e7a0890 -> 4e2e547d2
  refs/heads/trunk e24681e70 -> 14912baff


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 14912baff79f1e27a07f937ad500730a798ab2f5
Parents: 7eb22e3 4e2e547
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri May 4 18:09:53 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri May 4 18:09:53 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../org/apache/cassandra/cache/FreeableMemory.java |    8 --------
 src/java/org/apache/cassandra/io/util/Memory.java  |   14 --------------
 3 files changed, 1 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/14912baf/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2978877,0c8e022..cf9eb97
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 +1.2-dev
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392)
 +
 +
  1.1.1-dev
+  * remove [Freeable]Memory finalizers (CASSANDRA-4222)
   * include tombstone size in ColumnFamily.size, which can prevent OOM
     during sudden mass delete operations (CASSANDRA-3741)
   * Open 1 sstableScanner per level for leveled compaction (CASSANDRA-4142)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14912baf/src/java/org/apache/cassandra/cache/FreeableMemory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14912baf/src/java/org/apache/cassandra/io/util/Memory.java
----------------------------------------------------------------------


Mime
View raw message