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/66dcdd9d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66dcdd9d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66dcdd9d Branch: refs/heads/trunk Commit: 66dcdd9da68d888e0d2dfdfeeeef2eb802bf236a Parents: c61a7e4 5e4b8f5 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Jul 11 23:36:26 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Jul 11 23:36:26 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 22 ++++++--- .../org/apache/cassandra/config/Config.java | 2 + .../cassandra/config/DatabaseDescriptor.java | 49 ++++++++++++++++++-- 4 files changed, 62 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/66dcdd9d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 321f594,080c0bc..6195d77 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,5 +1,21 @@@ +3.0 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7208) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 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) * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454) http://git-wip-us.apache.org/repos/asf/cassandra/blob/66dcdd9d/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
