You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/06/08 09:33:23 UTC
[2/5] git commit: Merge branch 'cassandra-1.1' into trunk
Merge branch 'cassandra-1.1' 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/844c90b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/844c90b3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/844c90b3
Branch: refs/heads/trunk
Commit: 844c90b3d04b46a5c0a37ae02c6bae19a20f0ce8
Parents: de6dba7 4ec0990
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jun 8 09:27:55 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jun 8 09:27:55 2012 +0200
----------------------------------------------------------------------
CHANGES.txt | 8 ++++++
.../org/apache/cassandra/config/CFMetaData.java | 2 +-
.../org/apache/cassandra/db/DeletedColumn.java | 8 ++++++
.../org/apache/cassandra/db/RemoveColumnTest.java | 20 +++++++++++++++
4 files changed, 37 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/844c90b3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 44c0b8a,e4c899c..ad613b8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,10 +1,30 @@@
+1.2-dev
+ * add inter-node message compression (CASSANDRA-3127)
+ * enforce 1m min keycache for auto (CASSANDRA-4306)
+ * remove COPP (CASSANDRA-2479)
+ * 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)
+ * Add support for range tombstones (CASSANDRA-3708)
+ * Improve MessagingService efficiency (CASSANDRA-3617)
+ * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794)
+ * Set thrift HSHA server thread limit to unlimet by default (CASSANDRA-4277)
+ * Avoids double serialization of CF id in RowMutation messages
+ (CASSANDRA-4293)
+ * fix Summary component and caches to use correct partitioner (CASSANDRA-4289)
+
++
+ 1.1.2
+ * enforce 1m min keycache for auto (CASSANDRA-4306)
+ * Have DeletedColumn.isMFD always return true (CASSANDRA-4307)
+ Merged from 1.0:
+ * Set gc_grace on index CF to 0 (CASSANDRA-4314)
+
+
1.1.1
* add getsstables command to nodetool (CASSANDRA-4199)
* apply parent CF compaction settings to secondary index CFs (CASSANDRA-4280)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/844c90b3/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/844c90b3/src/java/org/apache/cassandra/db/DeletedColumn.java
----------------------------------------------------------------------