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/5bc76b97 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5bc76b97 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5bc76b97 Branch: refs/heads/trunk Commit: 5bc76b97e4843fd366819523bb9e035964c07b37 Parents: 2d92f14 8e360f8 Author: Jonathan Ellis <[email protected]> Authored: Tue Mar 11 13:01:16 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Mar 11 13:01:16 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../stress/settings/OptionCompaction.java | 62 ++++++++++ .../cassandra/stress/settings/OptionMulti.java | 62 +++++++++- .../stress/settings/OptionReplication.java | 112 ++++++------------- .../cassandra/stress/settings/OptionSimple.java | 59 +++++++--- .../stress/settings/SettingsCommandMixed.java | 2 +- .../stress/settings/SettingsSchema.java | 32 +++--- 7 files changed, 213 insertions(+), 117 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc76b97/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 107db23,06331ad..e867867 --- 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 + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451) * 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)
