cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [08/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Fri, 08 Jan 2016 16:12:31 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8bd8a44
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8bd8a44
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8bd8a44

Branch: refs/heads/cassandra-3.0
Commit: e8bd8a44bcedbefd6874d0eb35e4a03c0027e9f1
Parents: 23123f0 0f27d68
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Fri Jan 8 16:05:14 2016 +0000
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Fri Jan 8 16:05:14 2016 +0000

----------------------------------------------------------------------
 CHANGES.txt                                            |  1 +
 src/java/org/apache/cassandra/gms/Gossiper.java        | 13 ++++++++++---
 .../apache/cassandra/net/IncomingTcpConnection.java    |  2 ++
 .../apache/cassandra/net/OutboundTcpConnection.java    |  2 ++
 4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e5c4430,a6a0c60..50d5f60
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
 -2.1.13
 +2.2.5
 + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
 + * Enable GC logging by default (CASSANDRA-10140)
 + * Optimize pending range computation (CASSANDRA-9258)
 + * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
 + * drop/alter user should be case sensitive (CASSANDRA-10817)
 + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 + * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 +Merged from 2.1:
+  * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
   * Fix pending range calculation during moves (CASSANDRA-10887)
   * Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
   * Match cassandra-loader options in COPY FROM (CASSANDRA-9303)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------


Mime
View raw message