Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6554bcc0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6554bcc0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6554bcc0
Branch: refs/heads/trunk
Commit: 6554bcc0f2cec44cef65dc7648a350ee2617d905
Parents: 307f916 cc3e0db
Author: Brandon Williams <[email protected]>
Authored: Wed Jul 30 11:58:39 2014 -0500
Committer: Brandon Williams <[email protected]>
Committed: Wed Jul 30 11:58:39 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 3 +
debian/cassandra.install | 1 -
.../apache/cassandra/gms/VersionedValue.java | 7 -
.../apache/cassandra/locator/TokenMetadata.java | 102 +--
.../cassandra/net/MessageDeliveryTask.java | 2 +-
.../org/apache/cassandra/net/MessageIn.java | 2 +-
.../service/PendingRangeCalculatorService.java | 16 +-
.../ScheduledRangeTransferExecutorService.java | 136 ----
.../cassandra/service/StorageService.java | 149 +---
.../cassandra/service/StorageServiceMBean.java | 10 -
.../org/apache/cassandra/tools/NodeProbe.java | 5 -
.../org/apache/cassandra/tools/NodeTool.java | 21 -
.../org/apache/cassandra/tools/Shuffle.java | 722 -------------------
.../apache/cassandra/service/RelocateTest.java | 205 ------
15 files changed, 9 insertions(+), 1373 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6554bcc0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 053577f,c4772a7..4e3e78d
--- 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
+ * Remove shuffle and taketoken (CASSANDRA-7601)
* Clean up Windows batch scripts (CASSANDRA-7619)
* Fix native protocol drop user type notification (CASSANDRA-7571)
* Give read access to system.schema_usertypes to all authenticated users
