merge from 2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4cc5fd10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4cc5fd10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4cc5fd10 Branch: refs/heads/trunk Commit: 4cc5fd10de29bc612624177feaaed6959664671d Parents: 46ea040 80ef282 Author: Jonathan Ellis <[email protected]> Authored: Wed Jun 3 10:32:01 2015 -0700 Committer: Jonathan Ellis <[email protected]> Committed: Wed Jun 3 10:32:01 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 13 +++++++++++++ conf/cassandra.yaml | 11 +++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4cc5fd10/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index aeae5e8,f5f9862..f075929 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,5 +1,21 @@@ +2.2 + * Clean up gossiper logic for old versions (CASSANDRA-9370) + * Fix custom payload coding/decoding to match the spec (CASSANDRA-9515) + * ant test-all results incomplete when parsed (CASSANDRA-9463) + * Disallow frozen<> types in function arguments and return types for + clarity (CASSANDRA-9411) + * Static Analysis to warn on unsafe use of Autocloseable instances (CASSANDRA-9431) + * Update commitlog archiving examples now that commitlog segments are + not recycled (CASSANDRA-9350) + * Extend Transactional API to sstable lifecycle management (CASSANDRA-8568) + * (cqlsh) Add support for native protocol 4 (CASSANDRA-9399) + * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409) + * Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429) + * Add ability to stop compaction by ID (CASSANDRA-7207) + * Let CassandraVersion handle SNAPSHOT version (CASSANDRA-9438) +Merged from 2.1: 2.1.6 + * Default commitlog_sync_batch_window_in_ms changed to 2ms (CASSANDRA-9504) * Fix empty partition assertion in unsorted sstable writing tools (CASSANDRA-9071) * Ensure truncate without snapshot cannot produce corrupt responses (CASSANDRA-9388) * Consistent error message when a table mixes counter and non-counter http://git-wip-us.apache.org/repos/asf/cassandra/blob/4cc5fd10/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index cc80cc1,2f4166a..0d6f170 --- a/NEWS.txt +++ b/NEWS.txt @@@ -137,9 -25,13 +137,13 @@@ Upgradin 2.1.4 ===== + + Upgrading + --------- -The default JMX config now listens to localhost only. You must enable +The default JMX config now listens to localhost only. You must enable the other JMX flags in cassandra-env.sh manually. + 2.1.3 ===== http://git-wip-us.apache.org/repos/asf/cassandra/blob/4cc5fd10/conf/cassandra.yaml ----------------------------------------------------------------------
