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, 02 Nov 2016 18:24:18 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/8fcedf54
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8fcedf54
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8fcedf54

Branch: refs/heads/trunk
Commit: 8fcedf544a7732341dc675804237814184910b14
Parents: 8abb632 d2d7299
Author: Robert Stupp <snazy@snazy-ds15.local>
Authored: Wed Nov 2 19:22:23 2016 +0100
Committer: Robert Stupp <snazy@snazy-ds15.local>
Committed: Wed Nov 2 19:22:23 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fcedf54/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a1462a6,25facd5..176d34a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +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
+  * Don't load MX4J beans twice (CASSANDRA-12869)
   * Extend native protocol request flags, add versions to SUPPORTED, and introduce ProtocolVersion
enum (CASSANDRA-12838)
   * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
   * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)


Mime
View raw message