Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed7b08b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed7b08b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed7b08b3 Branch: refs/heads/trunk Commit: ed7b08b399df8cad311a28a25a47c576238d3f0a Parents: 3a70933 8d3d67e Author: Dave Brosius <[email protected]> Authored: Fri Sep 27 22:03:47 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Fri Sep 27 22:03:47 2013 -0400 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
