cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/12] git commit: merge from 1.1
Date Tue, 27 Mar 2012 14:53:07 GMT
Updated Branches:
  refs/heads/cassandra-1.0 8b23dcaef -> 059417991
  refs/heads/cassandra-1.1 b4af12b43 -> 36a1ea8e5
  refs/heads/cassandra-1.1.0 c38d32638 -> d361ed2f8
  refs/heads/trunk 17dd5cd18 -> ad37161c0


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

Branch: refs/heads/trunk
Commit: ad37161c0222ef9c91465fb72e39da9bbb249cac
Parents: 17dd5cd 36a1ea8
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Mar 27 09:52:56 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Mar 27 09:52:56 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    5 +-
 .../apache/cassandra/db/marshal/CompositeType.java |   92 ++++++---------
 .../apache/cassandra/io/util/DataOutputBuffer.java |   46 +++++---
 .../org/apache/cassandra/io/util/OutputBuffer.java |   72 -----------
 .../apache/cassandra/thrift/CassandraServer.java   |   19 +--
 5 files changed, 78 insertions(+), 156 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad37161c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bc60e40,7a07823..85ee8e2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,6 +1,13 @@@
 +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)
 +
 +
  1.1.1-dev
+  * clean up and optimize DataOutputBuffer, used by CQL compression and
+    CompositeType (CASSANDRA-4072)
   * optimize commitlog checksumming (CASSANDRA-3610)
   * identify and blacklist corrupted SSTables from future compactions (CASSANDRA-2261)
   * Move CfDef and KsDef validation out of thrift (CASSANDRA-4037)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad37161c/src/java/org/apache/cassandra/db/marshal/CompositeType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad37161c/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad37161c/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------


Mime
View raw message