cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Wed, 27 Apr 2016 08:15:14 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 8bfe09f4660aee6401b36f43322adfca6273d786
Parents: f2afd04 3db30aa
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Wed Apr 27 10:10:42 2016 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed Apr 27 10:10:42 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 .../apache/cassandra/db/compaction/CompactionManager.java    | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bfe09f4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f02d4f2,e8a301a..bc15d32
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 -2.2.7
 +3.0.6
 + * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
 + * Ignore all LocalStrategy keyspaces for streaming and other related
 +   operations (CASSANDRA-11627)
 + * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523)
 + * Only open one sstable scanner per sstable (CASSANDRA-11412)
 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
 + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
 + * LogAwareFileLister should only use OLD sstable files in current folder to determine disk
consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120)
 +Merged from 2.2:
+  * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660)
   * Add missing files to debian packages (CASSANDRA-11642)
   * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621)
   * cqlsh: COPY FROM should use regular inserts for single statement batches and

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bfe09f4/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------


Mime
View raw message