Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/84fe374d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84fe374d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84fe374d Branch: refs/heads/trunk Commit: 84fe374d2964079c2b54f7eb3682af977f75378f Parents: e8ee9ed d766f4f Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Nov 10 14:42:46 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Nov 10 14:42:46 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../cassandra/hadoop/cql3/CqlRecordWriter.java | 94 ++++++++++---------- .../io/sstable/CQLSSTableWriterTest.java | 2 +- 3 files changed, 51 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/84fe374d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 268ad08,24e42c0..03b8544 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,4 -1,6 +1,6 @@@ -3.0.1 +3.1 + Merged from 2.2: + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) Merged from 2.1: * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258) * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)