You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/07/09 22:39:33 UTC
[3/4] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2500951e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2500951e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2500951e
Branch: refs/heads/trunk
Commit: 2500951e0cd296828f06a4cd57d2390f60d1980f
Parents: 15ced94 109e600
Author: Jake Luciani <ja...@apache.org>
Authored: Wed Jul 9 16:30:37 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Wed Jul 9 16:30:37 2014 -0400
----------------------------------------------------------------------
.../ic/Keyspace1/Keyspace1-Standard1-ic-0-Data.db | Bin 45000 -> 0 bytes
.../Keyspace1/Keyspace1-Standard1-ic-0-Digest.sha1 | 1 -
.../Keyspace1/Keyspace1-Standard1-ic-0-Filter.db | Bin 1136 -> 0 bytes
.../ic/Keyspace1/Keyspace1-Standard1-ic-0-Index.db | Bin 15300 -> 0 bytes
.../Keyspace1-Standard1-ic-0-Statistics.db | Bin 4361 -> 0 bytes
.../Keyspace1/Keyspace1-Standard1-ic-0-Summary.db | Bin 202 -> 0 bytes
.../ic/Keyspace1/Keyspace1-Standard1-ic-0-TOC.txt | 7 -------
.../jb/Keyspace1/Keyspace1-Standard1-jb-0-CRC.db | Bin 0 -> 8 bytes
.../jb/Keyspace1/Keyspace1-Standard1-jb-0-Data.db | Bin 0 -> 36000 bytes
.../Keyspace1/Keyspace1-Standard1-jb-0-Digest.sha1 | 1 +
.../Keyspace1/Keyspace1-Standard1-jb-0-Filter.db | Bin 0 -> 1136 bytes
.../jb/Keyspace1/Keyspace1-Standard1-jb-0-Index.db | Bin 0 -> 15300 bytes
.../Keyspace1-Standard1-jb-0-Statistics.db | Bin 0 -> 4395 bytes
.../Keyspace1/Keyspace1-Standard1-jb-0-Summary.db | Bin 0 -> 202 bytes
.../jb/Keyspace1/Keyspace1-Standard1-jb-0-TOC.txt | 8 ++++++++
.../cassandra/io/sstable/LegacySSTableTest.java | 9 +++++++++
16 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2500951e/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
----------------------------------------------------------------------