You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2016/10/18 12:03:56 UTC
[2/2] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42e0fc5e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42e0fc5e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42e0fc5e
Branch: refs/heads/trunk
Commit: 42e0fc5ee221950875d93b4cd007d4f5bcaa4244
Parents: a4705c2 9fc14bc
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Oct 18 14:01:05 2016 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Oct 18 14:01:05 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
doc/source/operating/compaction.rst | 6 +++-
pylib/cqlshlib/cql3handling.py | 1 +
.../apache/cassandra/db/ColumnFamilyStore.java | 5 +++
.../cassandra/db/ColumnFamilyStoreMBean.java | 5 +++
.../compaction/CompactionStrategyManager.java | 17 ++++++++++
.../compaction/LeveledCompactionStrategy.java | 34 +++++++++++++++++++-
.../db/compaction/LeveledManifest.java | 21 ++++++++----
.../writers/MajorLeveledCompactionWriter.java | 4 ++-
.../cassandra/tools/StandaloneScrubber.java | 4 +--
.../tools/nodetool/stats/TableStatsHolder.java | 2 +-
.../LongLeveledCompactionStrategyTest.java | 2 +-
.../unit/org/apache/cassandra/SchemaLoader.java | 1 +
.../validation/miscellaneous/OverflowTest.java | 2 +-
.../db/compaction/CompactionsCQLTest.java | 2 +-
15 files changed, 91 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/42e0fc5e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8f112ed,20a64e1..eed6ee8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
+4.0
+ * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
+ * Add (automate) Nodetool Documentation (CASSANDRA-12672)
+ * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
+ * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
+ * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
+
3.10
+ * Make the fanout size for LeveledCompactionStrategy to be configurable (CASSANDRA-11550)
* Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
* Improve sum aggregate functions (CASSANDRA-12417)
* Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes in CASSANDRA-10876 (CASSANDRA-12761)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/42e0fc5e/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
----------------------------------------------------------------------