cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Date Thu, 26 Sep 2013 18:22:01 GMT
Merge branch 'cassandra-2.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/2c7b61b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c7b61b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2c7b61b7

Branch: refs/heads/trunk
Commit: 2c7b61b76ec034afe4267fdaecd0905db16b40eb
Parents: 5832cc8 d493030
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Sep 26 13:20:25 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Sep 26 13:20:25 2013 -0500

----------------------------------------------------------------------
 .../Keyspace1-Standard3-ja-1-CRC.db             | Bin 8 -> 0 bytes
 .../Keyspace1-Standard3-ja-1-Data.db            | Bin 354 -> 0 bytes
 .../Keyspace1-Standard3-ja-1-Digest.sha1        |   1 -
 .../Keyspace1-Standard3-ja-1-Filter.db          | Bin 176 -> 0 bytes
 .../Keyspace1-Standard3-ja-1-Index.db           | Bin 90 -> 0 bytes
 .../Keyspace1-Standard3-ja-1-Statistics.db      | Bin 4377 -> 0 bytes
 .../Keyspace1-Standard3-ja-1-Summary.db         | Bin 83 -> 0 bytes
 .../Keyspace1-Standard3-ja-1-TOC.txt            |   8 -
 .../Keyspace1-Standard3-jb-1-CompressionInfo.db | Bin 0 -> 43 bytes
 .../Keyspace1-Standard3-jb-1-Data.db            | Bin 0 -> 133 bytes
 .../Keyspace1-Standard3-jb-1-Filter.db          | Bin 0 -> 24 bytes
 .../Keyspace1-Standard3-jb-1-Index.db           | Bin 0 -> 90 bytes
 .../Keyspace1-Standard3-jb-1-Statistics.db      | Bin 0 -> 4390 bytes
 .../Keyspace1-Standard3-jb-1-Summary.db         | Bin 0 -> 71 bytes
 .../Keyspace1-Standard3-jb-1-TOC.txt            |   7 +
 .../unit/org/apache/cassandra/db/ScrubTest.java | 206 +++++++++++++++++++
 16 files changed, 213 insertions(+), 9 deletions(-)
----------------------------------------------------------------------



Mime
View raw message