Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b888f80d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b888f80d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b888f80d Branch: refs/heads/cassandra-2.1 Commit: b888f80d679b6bf1059ed9a7227b74ea10f06143 Parents: 63407db d4d6246 Author: Jonathan Ellis <[email protected]> Authored: Thu Jul 31 12:11:27 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jul 31 12:11:27 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/b888f80d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8aedebe,5210e0d..4a49256 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +2.1.1 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * 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)
