Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b14f6a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b14f6a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b14f6a5 Branch: refs/heads/trunk Commit: 3b14f6a5dbc91b3e8d2efa95840a61604dd6fbcb Parents: 82fa5d5 df7bd7f Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jul 21 07:51:10 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jul 21 07:51:10 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- build.xml | 2 +- conf/cassandra-env.sh | 4 ++-- debian/changelog | 6 ++++++ 4 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b14f6a5/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8fa96f6,5ba30cc..2aa2efa --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,4 +1,15 @@@ +2.1.1 + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Fail to start if commit log replay detects a problem (CASSANDRA-7125) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) + * Fix native protocol drop user type notification (CASSANDRA-7571) + + - 2.1.0-final + 2.1.0-rc4 * Updated memtable_cleanup_threshold and memtable_flush_writers defaults (CASSANDRA-7551) * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b14f6a5/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b14f6a5/conf/cassandra-env.sh ----------------------------------------------------------------------