cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 07 Mar 2014 19:13:19 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 17adc5963838e8a7544cf0d3202219d2e09fbfcf
Parents: 4d63358 893c11f
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Fri Mar 7 13:10:21 2014 -0600
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Fri Mar 7 13:10:21 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 conf/cassandra.yaml                             | 15 ++++--
 .../org/apache/cassandra/config/Config.java     |  1 +
 .../cassandra/config/DatabaseDescriptor.java    | 49 ++++++++++++++++++--
 .../cassandra/locator/Ec2MultiRegionSnitch.java |  1 +
 .../cassandra/service/CassandraDaemon.java      |  2 +-
 .../cassandra/service/StorageService.java       |  4 +-
 .../org/apache/cassandra/transport/Server.java  |  2 +
 8 files changed, 62 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/17adc596/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bec6cdb,709b05a..bd9a565
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.0
 + * Remove CQL2 (CASSANDRA-5918)
 + * add Thrift get_multi_slice call (CASSANDRA-6757)
 +
 +
  2.1.0-beta2
+  * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
   * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
   * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
   * Fix ABTC NPE (CASSANDRA-6692)


Mime
View raw message