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/accf7a47
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/accf7a47
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/accf7a47

Branch: refs/heads/trunk
Commit: accf7a4724e244d6f1ba921cb11d2554dbb54a76
Parents: d8ca69c 67909ea
Author: Carl Yeksigian <c...@apache.org>
Authored: Tue Jul 26 09:59:43 2016 -0400
Committer: Carl Yeksigian <c...@apache.org>
Committed: Tue Jul 26 10:00:04 2016 -0400

----------------------------------------------------------------------
 CHANGES.txt                                               |  2 +-
 .../apache/cassandra/service/AbstractReadExecutor.java    | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/accf7a47/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ed165e2,50f7a6d..c586d10
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,3 +1,20 @@@
 +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)
 + * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
 +
 +
- 
  3.9
   * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
   * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)

Reply via email to