cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Tue, 11 Aug 2015 01:50:06 GMT
Merge branch 'cassandra-3.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/e8ac7edb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8ac7edb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8ac7edb

Branch: refs/heads/trunk
Commit: e8ac7edb736359cad442d2a5469de4bd5d711bd8
Parents: 1a1c5a0 76ca697
Author: Yuki Morishita <yukim@apache.org>
Authored: Mon Aug 10 20:37:23 2015 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Mon Aug 10 20:37:23 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../org/apache/cassandra/db/SystemKeyspace.java |   6 ++---
 .../apache/cassandra/io/sstable/Descriptor.java |  27 ++++++++++++-------
 ...pactions_in_progress-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes
 .../system-compactions_in_progress-ka-1-Data.db | Bin 0 -> 146 bytes
 ...tem-compactions_in_progress-ka-1-Digest.sha1 |   1 +
 ...ystem-compactions_in_progress-ka-1-Filter.db | Bin 0 -> 16 bytes
 ...system-compactions_in_progress-ka-1-Index.db | Bin 0 -> 30 bytes
 ...m-compactions_in_progress-ka-1-Statistics.db | Bin 0 -> 4450 bytes
 ...stem-compactions_in_progress-ka-1-Summary.db | Bin 0 -> 116 bytes
 .../system-compactions_in_progress-ka-1-TOC.txt |   8 ++++++
 .../test-foo-ka-3-CompressionInfo.db            | Bin 0 -> 43 bytes
 .../test-foo-ka-3-Data.db                       | Bin 0 -> 141 bytes
 .../test-foo-ka-3-Digest.sha1                   |   1 +
 .../test-foo-ka-3-Filter.db                     | Bin 0 -> 176 bytes
 .../test-foo-ka-3-Index.db                      | Bin 0 -> 90 bytes
 .../test-foo-ka-3-Statistics.db                 | Bin 0 -> 4458 bytes
 .../test-foo-ka-3-Summary.db                    | Bin 0 -> 80 bytes
 .../test-foo-ka-3-TOC.txt                       |   8 ++++++
 .../test-foo-tmp-ka-4-Data.db                   | Bin 0 -> 141 bytes
 .../test-foo-tmp-ka-4-Index.db                  | Bin 0 -> 90 bytes
 .../test-foo-tmplink-ka-4-Data.db               | Bin 0 -> 141 bytes
 .../test-foo-tmplink-ka-4-Index.db              | Bin 0 -> 90 bytes
 .../apache/cassandra/db/SystemKeyspaceTest.java |  19 ++++++++++---
 24 files changed, 55 insertions(+), 16 deletions(-)
----------------------------------------------------------------------



Mime
View raw message