cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [2/4] git commit: Merge branch 'cassandra-1.1' into trunk
Date Fri, 06 Jul 2012 20:16:26 GMT
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/41ec9fc4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41ec9fc4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41ec9fc4

Branch: refs/heads/trunk
Commit: 41ec9fc45566682e11851d8c73803222232e4b55
Parents: 1440079 aa2c28e
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Jul 6 14:27:20 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Jul 6 14:27:20 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 conf/cassandra.yaml                                |   21 ++++++++++-----
 src/java/org/apache/cassandra/config/Config.java   |    4 +-
 .../cassandra/config/DatabaseDescriptor.java       |    6 ++++
 4 files changed, 24 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/41ec9fc4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index df09f6f,1857671..ecda2dc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,6 +1,35 @@@
 +1.2-dev
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * 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, 4289)
 + * 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 unlimited by default (CASSANDRA-4277)
 + * Avoids double serialization of CF id in RowMutation messages
 +   (CASSANDRA-4293)
 + * stream compressed sstables directly with java nio (CASSANDRA-4297)
 + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885)
 + * Add column metadata to system column families (CASSANDRA-4018)
 + * (cql3) always use composite types by default (CASSANDRA-4329)
 +
 +
  1.1.3
+  * update default commitlog segment size to 32MB and total commitlog
+    size to 32/1024 MB for 32/64 bit JVMs, respectively (CASSANDRA-4422)
   * avoid using global partitioner to estimate ranges in index sstables
     (CASSANDRA-4403)
   * restore pre-CASSANDRA-3862 approach to removing expired tombstones

http://git-wip-us.apache.org/repos/asf/cassandra/blob/41ec9fc4/conf/cassandra.yaml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/41ec9fc4/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/41ec9fc4/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------


Mime
View raw message