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/29d3d44d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29d3d44d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29d3d44d Branch: refs/heads/trunk Commit: 29d3d44d2056e5ab84a2a5357cd782344683fc8e Parents: 342e33f 941a5dd Author: Benedict Elliott Smith <bened...@apache.org> Authored: Sun Aug 23 11:51:10 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Sun Aug 23 11:51:10 2015 +0100 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29d3d44d/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java ----------------------------------------------------------------------
