cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Sun, 13 Nov 2016 12:06:32 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/e1427e23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1427e23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1427e23

Branch: refs/heads/trunk
Commit: e1427e238e38da21485996da9c681aa72de81ef1
Parents: 1b91cd5 c31463a
Author: Robert Stupp <snazy@snazy-ds15.fritz.box>
Authored: Sun Nov 13 12:57:04 2016 +0100
Committer: Robert Stupp <snazy@snazy-ds15.fritz.box>
Committed: Sun Nov 13 12:57:04 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  5 +++
 .../functions/ThreadAwareSecurityManager.java   | 43 ++++++++++++++++++++
 .../validation/operations/AggregationTest.java  |  4 +-
 3 files changed, 51 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1427e23/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f285875,7b59c07..ea757f6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,8 +1,16 @@@
 +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.11
+ Merged from 3.0:
+  * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
+ 
+ 
  3.10
   * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
   * Fix cassandra-stress truncate option (CASSANDRA-12695)


Mime
View raw message