cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Wed, 09 Jul 2014 20:30:14 GMT
Merge branch 'cassandra-2.1.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/109e600f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/109e600f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/109e600f

Branch: refs/heads/cassandra-2.1
Commit: 109e600fa4e2230aafd3eb90ccdb37b1bdb7a471
Parents: 40fd7f0 ae37410
Author: Jake Luciani <jake@apache.org>
Authored: Wed Jul 9 16:22:30 2014 -0400
Committer: Jake Luciani <jake@apache.org>
Committed: Wed Jul 9 16:22:30 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(-)
----------------------------------------------------------------------



Mime
View raw message