cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [5/6] git commit: merge from 2.0
Date Wed, 14 May 2014 17:01:51 GMT
merge from 2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a5365eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a5365eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a5365eb

Branch: refs/heads/cassandra-2.1
Commit: 8a5365ebd5c8118e5fb846aef1b89d630236b878
Parents: 1927d5e 541a20d
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed May 14 09:56:57 2014 -0700
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed May 14 10:01:31 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                    | 4 ++++
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 ++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a5365eb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 504064c,9a43040..5fd5a8b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,9 +1,26 @@@
 -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)
 +Merged from 2.0:
+  * (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)
 + * Correctly delete scheduled range xfers (CASSANDRA-7143)
 + * Make batchlog replica selection rack-aware (CASSANDRA-6551)
 + * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
 + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
 
 + * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191)
   * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
   * Fix disabling autocompaction (CASSANDRA-7187)
   * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a5365eb/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------


Mime
View raw message