cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [9/9] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Date Wed, 06 Jul 2016 06:17:34 GMT
Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: 60359948d889d73158005cbfa137e6217324a42b
Parents: 2444349 574e8df
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Wed Jul 6 08:08:50 2016 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed Jul 6 08:08:50 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 14 +++----
 .../cassandra/db/PartitionRangeReadCommand.java |  2 +-
 .../cassandra/db/SizeEstimatesRecorder.java     |  8 +++-
 .../compaction/AbstractCompactionStrategy.java  |  2 +-
 .../db/compaction/CompactionController.java     |  2 +-
 .../DateTieredCompactionStrategy.java           |  2 +-
 .../TimeWindowCompactionStrategy.java           |  2 +-
 .../apache/cassandra/db/lifecycle/Tracker.java  |  2 +-
 .../org/apache/cassandra/db/lifecycle/View.java | 36 +++++++++--------
 .../apache/cassandra/db/view/ViewBuilder.java   |  4 +-
 .../cassandra/index/SecondaryIndexManager.java  |  2 +-
 .../index/internal/CassandraIndex.java          |  2 +-
 .../io/sstable/IndexSummaryManager.java         |  2 +-
 .../cassandra/streaming/StreamSession.java      | 12 ++++--
 .../apache/cassandra/db/lifecycle/ViewTest.java |  8 ++--
 .../index/internal/CustomCassandraIndex.java    |  2 +-
 .../io/sstable/SSTableRewriterTest.java         | 41 +++++++++++++++++++-
 18 files changed, 100 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/60359948/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message