cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Wed, 05 Oct 2016 07:43:20 GMT
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/670b99b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/670b99b9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/670b99b9

Branch: refs/heads/trunk
Commit: 670b99b9d36542bc33db2eb782fa49175faf0d27
Parents: c6338cd b3a4e20
Author: Robert Stupp <snazy@snazy-ds15.fritz.box>
Authored: Wed Oct 5 09:39:23 2016 +0200
Committer: Robert Stupp <snazy@snazy-ds15.fritz.box>
Committed: Wed Oct 5 09:39:23 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../org/apache/cassandra/config/Config.java     | 116 ++++++-------
 .../cassandra/config/DatabaseDescriptor.java    | 164 ++++++++++---------
 .../org/apache/cassandra/db/SystemKeyspace.java |   2 +-
 .../db/commitlog/CommitLogReplayer.java         |   5 +-
 .../compaction/LeveledCompactionStrategy.java   |  14 +-
 .../cassandra/net/IncomingTcpConnection.java    |   2 +-
 .../cassandra/net/OutboundTcpConnection.java    |   2 +-
 .../repair/SystemDistributedKeyspace.java       |   3 +-
 .../apache/cassandra/schema/SchemaKeyspace.java |   2 +-
 10 files changed, 160 insertions(+), 151 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/670b99b9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4f7ebfb,08de041..837b976
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +4.0
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
 +
 +
  3.10
+  * Config class uses boxed types but DD exposes primitive types (CASSANDRA-12199)
   * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
   * Add hint delivery metrics (CASSANDRA-12693)
   * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)


Mime
View raw message