You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/08/14 23:02:14 UTC
[1/14] git commit: merge from 1.1
Updated Branches:
refs/heads/cassandra-1.1 a201422b2 -> 17c1787e9
refs/heads/trunk e243db435 -> 1a44fa7ea
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/1a44fa7e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a44fa7e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a44fa7e
Branch: refs/heads/trunk
Commit: 1a44fa7ea20a0be92cc0cb0f87c270a7dd2f6334
Parents: e243db4 17c1787
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 14 16:01:41 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 14 16:01:41 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 6 ++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
.../cassandra/hadoop/ColumnFamilyRecordReader.java | 2 +-
4 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a44fa7e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f823937,dfb77d6..5d878bc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,12 +1,50 @@@
+1.2-dev
+ * clean up ioexceptions (CASSANDRA-2116)
+ * Introduce new json format with row level deletion (CASSANDRA-4054)
+ * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
+ * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
+ * 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, 4234)
+ * 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)
+ * (cql3) Add support for set, map and list (CASSANDRA-3647)
+ * Validate date type correctly (CASSANDRA-4441)
+ * (cql3) Allow definitions with only a PK (CASSANDRA-4361)
+ * (cql3) Add support for row key composites (CASSANDRA-4179)
+ * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038)
+ * (cql3) Add support for 2ndary indexes (CASSANDRA-3680)
+
+
1.1.4
* fix offline scrub to catch >= out of order rows (CASSANDRA-4411)
+ * fix cassandra-env.sh on RHEL and other non-dash-based systems
+ (CASSANDRA-4494)
+ Merged from 1.0:
+ * (Hadoop) fix setting key length for old-style mapred api (CASSANDRA-4534)
-1.1.3
* munmap commitlog segments before rename (CASSANDRA-4337)
* (JMX) rename getRangeKeySample to sampleKeyRange to avoid returning
multi-MB results as an attribute (CASSANDRA-4452)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a44fa7e/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a44fa7e/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
----------------------------------------------------------------------