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/93718923 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93718923 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93718923 Branch: refs/heads/trunk Commit: 9371892374ddb8cc1d495ec4d38554603ec78a3a Parents: e30d6dc f67b7a4 Author: Tyler Hobbs <ty...@datastax.com> Authored: Thu Mar 6 11:55:59 2014 -0600 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Thu Mar 6 11:55:59 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 +- .../org/apache/cassandra/locator/Ec2Snitch.java | 2 +- .../locator/GossipingPropertyFileSnitch.java | 104 ++++++++++++++++--- .../cassandra/locator/PropertyFileSnitch.java | 2 +- .../cassandra/locator/SnitchProperties.java | 10 +- test/conf/cassandra-rackdc.properties.mod | 17 +++ .../GossipingPropertyFileSnitchTest.java | 59 +++++++++++ .../YamlFileNetworkTopologySnitchTest.java | 2 +- 9 files changed, 176 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/93718923/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7cb3e97,af7f2fd..09ad14b --- 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 + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897) * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573) * Fix ABTC NPE (CASSANDRA-6692) * Allow nodetool to use a file or prompt for password (CASSANDRA-6660) http://git-wip-us.apache.org/repos/asf/cassandra/blob/93718923/build.xml ----------------------------------------------------------------------
