cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [4/4] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Date Fri, 12 Aug 2016 23:36:04 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/00a62814
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00a62814
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00a62814

Branch: refs/heads/trunk
Commit: 00a62814ae54719babca04dcceca5351197391bf
Parents: 57ece5a d597910
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Fri Aug 12 18:34:57 2016 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Fri Aug 12 18:34:57 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 NEWS.txt                                        |  2 ++
 .../cassandra/config/DatabaseDescriptor.java    |  6 ++--
 .../cassandra/locator/Ec2MultiRegionSnitch.java |  6 +++-
 .../cassandra/service/StorageService.java       |  4 +--
 .../org/apache/cassandra/transport/Server.java  |  2 +-
 .../org/apache/cassandra/utils/FBUtilities.java | 19 ++++++++++++
 .../apache/cassandra/utils/FBUtilitiesTest.java | 32 ++++++++++++++++++++
 8 files changed, 66 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/00a62814/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 956cfdd,05d09dc..9d80f94
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -123,7 -83,9 +123,8 @@@ Merged from 3.0
   * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
   * Fix EOF exception when altering column type (CASSANDRA-11820)
  Merged from 2.2:
+  * Only set broadcast_rpc_address on Ec2MultiRegionSnitch if it's not set (CASSANDRA-11357)
   * Update StorageProxy range metrics for timeouts, failures and unavailables (CASSANDRA-9507)
 - * Add Sigar to classes included in clientutil.jar (CASSANDRA-11635)
   * Add decay to histograms and timers used for metrics (CASSANDRA-11752)
   * Fix hanging stream session (CASSANDRA-10992)
   * Fix INSERT JSON, fromJson() support of smallint, tinyint types (CASSANDRA-12371)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00a62814/NEWS.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00a62814/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00a62814/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00a62814/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00a62814/src/java/org/apache/cassandra/utils/FBUtilities.java
----------------------------------------------------------------------


Mime
View raw message