cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 03 Jun 2015 12:12:03 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
	CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5947ee0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5947ee0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5947ee0

Branch: refs/heads/trunk
Commit: d5947ee07041a7af3ce84945036e760e0ba463bf
Parents: 99da210 b9a89a3
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Wed Jun 3 13:11:41 2015 +0100
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Wed Jun 3 13:11:41 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5947ee0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6f2c0ee,57bbfcc..f2c7ba0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,4 +1,20 @@@
 +2.2
 + * Clean up gossiper logic for old versions (CASSANDRA-9370)
 + * Fix custom payload coding/decoding to match the spec (CASSANDRA-9515)
 + * ant test-all results incomplete when parsed (CASSANDRA-9463)
 + * Disallow frozen<> types in function arguments and return types for
 +   clarity (CASSANDRA-9411)
 + * Static Analysis to warn on unsafe use of Autocloseable instances (CASSANDRA-9431)
 + * Update commitlog archiving examples now that commitlog segments are
 +   not recycled (CASSANDRA-9350)
 + * Extend Transactional API to sstable lifecycle management (CASSANDRA-8568)
 + * (cqlsh) Add support for native protocol 4 (CASSANDRA-9399)
 + * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409)
 + * Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429)
 + * Add ability to stop compaction by ID (CASSANDRA-7207)
 + * Let CassandraVersion handle SNAPSHOT version (CASSANDRA-9438)
 +Merged from 2.1:
+ 2.1.6
   * Ensure truncate without snapshot cannot produce corrupt responses (CASSANDRA-9388) 
   * Consistent error message when a table mixes counter and non-counter
     columns (CASSANDRA-9492)


Mime
View raw message