You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by be...@apache.org on 2015/06/01 17:44:47 UTC

[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

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/f1d175fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1d175fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1d175fb

Branch: refs/heads/trunk
Commit: f1d175fba16b24ecdea125c6a4b3d077b681c0db
Parents: cc6d142 3b85ea7
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon Jun 1 16:44:28 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon Jun 1 16:44:28 2015 +0100

----------------------------------------------------------------------
 .../io/sstable/format/SSTableReader.java        |  4 +-
 test/unit/org/apache/cassandra/MockSchema.java  | 16 ++++
 .../cassandra/db/lifecycle/TrackerTest.java     | 94 ++++++++++++--------
 3 files changed, 73 insertions(+), 41 deletions(-)
----------------------------------------------------------------------