Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f568a5d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f568a5d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f568a5d8 Branch: refs/heads/trunk Commit: f568a5d8a8fc2d165801e792f1133ac111c4df27 Parents: 8984ca7 0b99d33 Author: Aleksey Yeschenko <[email protected]> Authored: Sun Aug 9 23:04:01 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Sun Aug 9 23:04:01 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/net/MessagingService.java | 16 ++++++++-------- .../org/apache/cassandra/net/WriteCallbackInfo.java | 11 ++++++++++- .../org/apache/cassandra/service/StorageProxy.java | 12 ++++++++---- 4 files changed, 27 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f568a5d8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0ba7b4e,a913fe7..7cb9f16 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,11 +1,18 @@@ -2.2.1 +3.0.0-beta1 + * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704) + * Fix multiple slices on RowSearchers (CASSANDRA-10002) + * Fix bug in merging of collections (CASSANDRA-10001) + * Optimize batchlog replay to avoid full scans (CASSANDRA-7237) + * Repair improvements when using vnodes (CASSANDRA-5220) + * Disable scripted UDFs by default (CASSANDRA-9889) + * Add transparent data encryption core classes (CASSANDRA-9945) + * Bytecode inspection for Java-UDFs (CASSANDRA-9890) + * Use byte to serialize MT hash length (CASSANDRA-9792) +Merged from 2.2: * Add checksum to saved cache files (CASSANDRA-9265) * Log warning when using an aggregate without partition key (CASSANDRA-9737) - * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900) - * UDF / UDA execution time in trace (CASSANDRA-9723) - * Fix broken internode SSL (CASSANDRA-9884) Merged from 2.1: + * Write hints for paxos commits (CASSANDRA-7342) * (cqlsh) Fix timestamps before 1970 on Windows, always use UTC for timestamp display (CASSANDRA-10000) * (cqlsh) Avoid overwriting new config file with old config http://git-wip-us.apache.org/repos/asf/cassandra/blob/f568a5d8/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/net/MessagingService.java index 25eb0d0,f8fd6fd..0505445 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@@ -625,9 -617,7 +624,10 @@@ public final class MessagingService imp ConsistencyLevel consistencyLevel, boolean allowHints) { - assert message.verb == Verb.MUTATION || message.verb == Verb.COUNTER_MUTATION || message.verb == Verb.PAXOS_COMMIT; + assert message.verb == Verb.MUTATION - || message.verb == Verb.BATCHLOG_MUTATION - || message.verb == Verb.COUNTER_MUTATION; ++ || message.verb == Verb.BATCHLOG_MUTATION ++ || message.verb == Verb.COUNTER_MUTATION ++ || message.verb == Verb.PAXOS_COMMIT; int messageId = nextId(); CallbackInfo previous = callbacks.put(messageId, http://git-wip-us.apache.org/repos/asf/cassandra/blob/f568a5d8/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
