cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [13/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3
Date Thu, 07 Jan 2016 11:04:53 GMT
Merge branch 'cassandra-3.0' into cassandra-3.3


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

Branch: refs/heads/cassandra-3.3
Commit: 15cfeb779e6dd079da02fa4175b6898069b3318f
Parents: 5bf69ab 601203c
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Jan 7 12:03:52 2016 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Jan 7 12:03:52 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 NEWS.txt                                        |  7 ++++
 conf/cassandra.yaml                             |  3 +-
 .../org/apache/cassandra/config/Config.java     |  2 +-
 .../cassandra/service/StorageService.java       | 12 +++++++
 .../cassandra/service/StorageServiceMBean.java  |  3 ++
 .../org/apache/cassandra/tools/BulkLoader.java  | 12 ++++++-
 .../org/apache/cassandra/tools/NodeProbe.java   | 15 +++++++-
 .../org/apache/cassandra/tools/NodeTool.java    |  2 ++
 .../nodetool/GetInterDCStreamThroughput.java    | 33 +++++++++++++++++
 .../nodetool/SetInterDCStreamThroughput.java    | 37 ++++++++++++++++++++
 11 files changed, 123 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15cfeb77/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index db336e5,1533619..f8933fb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -47,7 -20,12 +47,8 @@@ Merged from 2.2
   * (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:
+  * Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
   * Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
   * Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309)
   * cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/15cfeb77/conf/cassandra.yaml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/15cfeb77/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/15cfeb77/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/15cfeb77/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/15cfeb77/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------


Mime
View raw message