Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/272300a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/272300a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/272300a5 Branch: refs/heads/trunk Commit: 272300a550f2f31e09d490de75f2a083dbd45f8c Parents: 698c808 4354fb2 Author: Yuki Morishita <[email protected]> Authored: Thu Feb 18 11:23:15 2016 -0600 Committer: Yuki Morishita <[email protected]> Committed: Thu Feb 18 11:23:15 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 36 ++++++++++++++++ .../repair/RepairMessageVerbHandler.java | 43 ++++++++++++++------ 3 files changed, 68 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/272300a5/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/272300a5/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/272300a5/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java ----------------------------------------------------------------------
