cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Date Wed, 09 May 2012 16:29:05 GMT
Updated Branches:
  refs/heads/cassandra-1.1 641346b0d -> fd66ccf21
  refs/heads/trunk 033486158 -> 1bb2f32d8


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

Branch: refs/heads/trunk
Commit: 1bb2f32d8f25da023a167fb0cd3f31059f4266da
Parents: 0334861 fd66ccf
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed May 9 11:28:49 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed May 9 11:28:49 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 .../org/apache/cassandra/config/CFMetaData.java    |    8 +++++-
 .../apache/cassandra/db/index/keys/KeysIndex.java  |   19 +++++++++++++++
 .../locator/AbstractReplicationStrategy.java       |    9 +++++++
 .../apache/cassandra/locator/LocalStrategy.java    |    1 +
 .../apache/cassandra/locator/SimpleStrategy.java   |    3 ++
 6 files changed, 41 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bb2f32d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e693a40,f17ffd1..d6e62c8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,16 @@@
 +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
+  * enable caching on index CFs based on data CF cache setting (CASSANDRA-4197)
+  * warn on invalid replication strategy creation options (CASSANDRA-4046)
   * remove [Freeable]Memory finalizers (CASSANDRA-4222)
   * include tombstone size in ColumnFamily.size, which can prevent OOM
     during sudden mass delete operations (CASSANDRA-3741)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bb2f32d/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bb2f32d/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bb2f32d/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bb2f32d/src/java/org/apache/cassandra/locator/LocalStrategy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bb2f32d/src/java/org/apache/cassandra/locator/SimpleStrategy.java
----------------------------------------------------------------------


Mime
View raw message