Updated Branches:
  refs/heads/trunk f70945eaa -> b25b12a0a

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

Branch: refs/heads/trunk
Commit: b25b12a0a9a15904fcd8126422d01100d611de44
Parents: f70945e f5619bb
Author: Pavel Yaskevich <xe...@apache.org>
Authored: Fri Aug 17 19:23:27 2012 +0300
Committer: Pavel Yaskevich <xe...@apache.org>
Committed: Fri Aug 17 19:23:27 2012 +0300

----------------------------------------------------------------------
 CHANGES.txt                                        |    4 ++++
 .../apache/cassandra/service/MigrationManager.java |    6 ++++++
 2 files changed, 10 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25b12a0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 39c92b1,2ea901f..426ac7d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,7 +1,49 @@@
 +1.2-dev
 + * run local range scans on the read stage (CASSANDRA-3687)
 + * 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)
 + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477)
 + * remove schema agreement checking from all external APIs (Thrift, CQL and 
CQL3) (CASSANDRA-4487)
 +
 +
+ 1.1.5
+  * Log(info) schema changes (CASSANDRA-4547)
+ 
+ 
  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 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25b12a0/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------

Reply via email to