Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03603b6d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03603b6d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03603b6d Branch: refs/heads/trunk Commit: 03603b6d84ffd221fb5df8d399566fc77ec71922 Parents: 06b2bd3 49cb12a Author: Benedict Elliott Smith <[email protected]> Authored: Wed Jun 3 22:55:49 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Wed Jun 3 22:55:49 2015 +0100 ---------------------------------------------------------------------- .../cassandra/db/lifecycle/TrackerTest.java | 1 + .../io/sstable/IndexSummaryManagerTest.java | 72 -------------------- 2 files changed, 1 insertion(+), 72 deletions(-) ----------------------------------------------------------------------
