Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b99d33e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b99d33e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b99d33e Branch: refs/heads/cassandra-2.2 Commit: 0b99d33eec5e703b6643aafc3a40a54f3fb088a0 Parents: a5297f1 07a7e80 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sun Aug 9 23:01:06 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sun Aug 9 23:01:06 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/net/MessagingService.java | 13 ++++++------- .../org/apache/cassandra/net/WriteCallbackInfo.java | 11 ++++++++++- .../org/apache/cassandra/service/StorageProxy.java | 12 ++++++++---- 4 files changed, 25 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b99d33e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 705e560,7151883..a913fe7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ -2.1.9 +2.2.1 + * 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/0b99d33e/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/net/MessagingService.java index bb46bbf,d7825d4..f8fd6fd --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@@ -680,9 -661,9 +679,9 @@@ public final class MessagingService imp * suggest that a timeout occurred to the invoker of the send(). * @return an reference to message id used to match with the result */ - public int sendRR(MessageOut<? extends IMutation> message, + public int sendRR(MessageOut<?> message, InetAddress to, - AbstractWriteResponseHandler<? extends IMutation> handler, - AbstractWriteResponseHandler handler, ++ AbstractWriteResponseHandler<?> handler, boolean allowHints) { int id = addCallback(handler, message, to, message.getTimeout(), handler.consistencyLevel, allowHints); http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b99d33e/src/java/org/apache/cassandra/net/WriteCallbackInfo.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b99d33e/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
