Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b1e23ab5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1e23ab5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1e23ab5 Branch: refs/heads/trunk Commit: b1e23ab54f659755fdd7c1adf5c14b05088337f6 Parents: e5a77cf 489be96 Author: Paulo Motta <[email protected]> Authored: Thu Dec 15 16:50:30 2016 -0200 Committer: Paulo Motta <[email protected]> Committed: Thu Dec 15 16:50:30 2016 -0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Keyspace.java | 89 +++++++++++--------- src/java/org/apache/cassandra/db/Mutation.java | 17 ++-- .../db/commitlog/CommitLogReplayer.java | 10 +-- src/java/org/apache/cassandra/hints/Hint.java | 40 ++++++--- .../apache/cassandra/hints/HintVerbHandler.java | 4 +- .../cassandra/service/paxos/PaxosState.java | 9 +- .../cassandra/streaming/StreamReceiveTask.java | 6 +- 8 files changed, 90 insertions(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1e23ab5/CHANGES.txt ----------------------------------------------------------------------
