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/6caade06 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6caade06 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6caade06 Branch: refs/heads/trunk Commit: 6caade065c690d7f4cf0333a8c3efa8e09ef0ff0 Parents: b221596 99da210 Author: Benedict Elliott Smith <[email protected]> Authored: Wed Jun 3 13:07:46 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Wed Jun 3 13:07:46 2015 +0100 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/MockSchema.java | 21 +++----- .../cassandra/db/lifecycle/HelpersTest.java | 7 ++- .../db/lifecycle/LifecycleTransactionTest.java | 52 ++++++++++++-------- .../cassandra/db/lifecycle/TrackerTest.java | 24 ++++++--- .../apache/cassandra/db/lifecycle/ViewTest.java | 24 +++++---- 5 files changed, 74 insertions(+), 54 deletions(-) ----------------------------------------------------------------------
