cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Wed, 01 Jun 2016 17:40:21 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0

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/6932bbd9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6932bbd9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6932bbd9

Branch: refs/heads/cassandra-3.7
Commit: 6932bbd909547684469ab5e2ea9e49c2e1005996
Parents: f99f8a8 b8f5c1f
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Wed Jun 1 12:39:23 2016 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Wed Jun 1 12:39:23 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                    | 1 +
 pylib/cqlshlib/cql3handling.py | 6 ++++++
 2 files changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6932bbd9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 07845a6,c97293d..a59dff1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 -2.2.7
 +3.0.7
 + * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
 + * Fix sstables not being protected from removal during index build (CASSANDRA-11905)
 + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
 + * Remove unneeded code to repair index summaries that have
 +   been improperly down-sampled (CASSANDRA-11127)
 + * Avoid WriteTimeoutExceptions during commit log replay due to materialized
 +   view lock contention (CASSANDRA-11891)
 + * Prevent OOM failures on SSTable corruption, improve tests for corruption detection (CASSANDRA-9530)
 + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
 + * Allow compaction strategies to disable early open (CASSANDRA-11754)
 + * Refactor Materialized View code (CASSANDRA-11475)
 + * Update Java Driver (CASSANDRA-11615)
 +Merged from 2.2:
+  * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
   * Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
   * Fix possible race condition in CommitLog.recover (CASSANDRA-11743)
   * Enable client encryption in sstableloader with cli options (CASSANDRA-11708)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6932bbd9/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------


Mime
View raw message