Merge branch 'cassandra-2.1.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8a4e4ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8a4e4ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8a4e4ff Branch: refs/heads/trunk Commit: b8a4e4ff7b53faa47f3857fe1f926f3d67b9fc85 Parents: 90ade6b d4d6246 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Jul 31 12:11:36 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Jul 31 12:11:36 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../concurrent/AbstractTracingAwareExecutorService.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8a4e4ff/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3d07769,5210e0d..5e80ccc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,34 -1,5 +1,35 @@@ +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-7028) + * 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 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add duration mode to cassandra-stress (CASSANDRA-7468) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * 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) +Merged from 2.0: + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + + 2.1.0-final + * Fix tracing on the new SEPExecutor (CASSANDRA-7644) * Remove shuffle and taketoken (CASSANDRA-7601) * Clean up Windows batch scripts (CASSANDRA-7619) * Fix native protocol drop user type notification (CASSANDRA-7571)
