Merge branch 'cassandra-2.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/6be62c2c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6be62c2c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6be62c2c
Branch: refs/heads/cassandra-2.1
Commit: 6be62c2c46de06170dd4a10327ecab4ab7a41d78
Parents: 92c38c0 569177f
Author: Brandon Williams <[email protected]>
Authored: Wed May 14 17:36:48 2014 -0500
Committer: Brandon Williams <[email protected]>
Committed: Wed May 14 17:36:48 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 32 ++++++++++++++++++--
2 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6be62c2c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d43a0f5,285efd1..450e337
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,7 +1,21 @@@
-2.0.9
+2.1.0-rc1
+ * Add PowerShell Windows launch scripts (CASSANDRA-7001)
+ * Make commitlog archive+restore more robust (CASSANDRA-6974)
+ * Fix marking commitlogsegments clean (CASSANDRA-6959)
+ * Add snapshot "manifest" describing files included (CASSANDRA-6326)
+ * Parallel streaming for sstableloader (CASSANDRA-3668)
+ * Fix bugs in supercolumns handling (CASSANDRA-7138)
+ * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
+ * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
+ * Upgrade NBHM lib (CASSANDRA-7128)
+ * Optimize netty server (CASSANDRA-6861)
+ * Fix repair hang when given CF does not exist (CASSANDRA-7189)
+ * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635)
+ * Add server side batching to native transport (CASSANDRA-5663)
+ * Make batchlog replay asynchronous (CASSANDRA-6134)
+Merged from 2.0:
+ * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
* (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
- * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
* Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
* Starting threads in OutboundTcpConnectionPool constructor causes race
conditions (CASSANDRA-7177)
* return all cpu values from BackgroundActivityMonitor.readAndCompute
(CASSANDRA-7183)
