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/62f20789 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62f20789 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62f20789 Branch: refs/heads/trunk Commit: 62f20789b14b516e29790365a857087644e494d9 Parents: b1fb6b9 29d3d44 Author: Benedict Elliott Smith <[email protected]> Authored: Sun Aug 23 11:51:17 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Sun Aug 23 11:51:17 2015 +0100 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
