You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2012/06/05 14:54:28 UTC
[1/3] git commit: merge from 1.1
Updated Branches:
refs/heads/trunk 604a38645 -> 90ce7ef21
merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90ce7ef2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90ce7ef2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90ce7ef2
Branch: refs/heads/trunk
Commit: 90ce7ef210b6bf915b1baf4f163bbb6a3e068c8f
Parents: 604a386 0144f2f
Author: Dave Brosius <db...@apache.org>
Authored: Tue Jun 5 08:53:52 2012 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Tue Jun 5 08:53:52 2012 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 +-
.../cassandra/config/DatabaseDescriptor.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90ce7ef2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 793a569,c0777d8..8c16c35
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,6 +1,21 @@@
-1.1.2
+1.2-dev
+ * 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.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/90ce7ef2/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------