cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/4] git commit: Merge branch 'cassandra-1.1' into trunk
Date Wed, 16 May 2012 16:53:12 GMT
Updated Branches:
  refs/heads/cassandra-1.1 1e8685d83 -> 7dae25d87
  refs/heads/trunk 34bdc7cc9 -> 71b38b094


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/71b38b09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71b38b09
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71b38b09

Branch: refs/heads/trunk
Commit: 71b38b09428abd95a9d70ae29ae9fd0061c5a0f4
Parents: 34bdc7c 7dae25d
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed May 16 11:52:57 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed May 16 11:52:57 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 ++
 .../org/apache/cassandra/db/ColumnFamilyStore.java |    1 +
 .../org/apache/cassandra/utils/FBUtilities.java    |    2 +-
 3 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/71b38b09/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 38c78f7,d59480a..27c5e58
--- 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
+  * log number of rows read from saved cache (CASSANDRA-4249)
   * calculate exact size required for cleanup operations (CASSANDRA-1404)
   * avoid blocking additional writes during flush when the commitlog
     gets behind temporarily (CASSANDRA-1991)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/71b38b09/src/java/org/apache/cassandra/utils/FBUtilities.java
----------------------------------------------------------------------


Mime
View raw message