cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Date Wed, 20 Jul 2016 12:11:49 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/a41fb507
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a41fb507
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a41fb507

Branch: refs/heads/trunk
Commit: a41fb50750f0ff034daf1734f5a90c274b098f3b
Parents: c193c2c 9eae8d3
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Wed Jul 20 13:06:25 2016 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Wed Jul 20 13:06:25 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +
 conf/cassandra-env.ps1                          |  21 ++--
 conf/cassandra-env.sh                           |  25 ++--
 .../cassandra/service/CassandraDaemon.java      |   1 -
 .../apache/cassandra/utils/JMXServerUtils.java  | 125 ++++++++++++++++---
 5 files changed, 132 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a41fb507/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c34a76f,c9dce65..679f60f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
 +3.10
 + * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
 + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
 + * Expose metrics for successful/failed authentication attempts (CASSANDRA-10635)
 + * Prepend snapshot name with "truncated" or "dropped" when a snapshot
 +   is taken before truncating or dropping a table (CASSANDRA-12178)
 + * Optimize RestrictionSet (CASSANDRA-12153)
 + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
 + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
 + * Create a system table to expose prepared statements (CASSANDRA-8831)
 + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
 + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
 + * Add supplied username to authentication error messages (CASSANDRA-12076)
 + * Remove pre-startup check for open JMX port (CASSANDRA-12074)
 +
 +
  3.9
+  * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
  Merged from 3.0:
   * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144)
  Merged from 2.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a41fb507/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------


Mime
View raw message