cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Sat, 17 Oct 2015 10:36:24 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/10c65d43
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10c65d43
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10c65d43

Branch: refs/heads/cassandra-3.0
Commit: 10c65d434c317b2c5462a3c2c428befd12986f7f
Parents: 56a06d7 20ce2cf
Author: Robert Stupp <snazy@snazy.de>
Authored: Sat Oct 17 11:38:38 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Sat Oct 17 11:39:37 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                             |  5 +++++
 .../cassandra/db/commitlog/CommitLogSegmentManager.java | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/10c65d43/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 33c360e,889438f..9b86ebd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,15 +1,31 @@@
 -2.2.4
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
++3.0
+ Merged from 2.1:
+  * AssertionError: attempted to delete non-existing file CommitLog (CASSANDRA-10377)
 - * (cqlsh) Distinguish negative and positive infinity in output (CASSANDRA-10523)
 - * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
 - * Don't allow startup if the node's rack has changed (CASSANDRA-10242)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+ 
+ 
 -2.2.3
 +3.0-rc2
 + * Fix SELECT DISTINCT queries between 2.2.2 nodes and 3.0 nodes (CASSANDRA-10473)
 + * Remove circular references in SegmentedFile (CASSANDRA-10543)
 + * Ensure validation of indexed values only occurs once per-partition (CASSANDRA-10536)
 + * Fix handling of static columns for range tombstones in thrift (CASSANDRA-10174)
 + * Support empty ColumnFilter for backward compatility on empty IN (CASSANDRA-10471)
 + * Remove Pig support (CASSANDRA-10542)
 + * Fix LogFile throws Exception when assertion is disabled (CASSANDRA-10522)
 + * Revert CASSANDRA-7486, make CMS default GC, move GC config to
 +   conf/jvm.options (CASSANDRA-10403)
 + * Fix TeeingAppender causing some logs to be truncated/empty (CASSANDRA-10447)
 + * Allow EACH_QUORUM for reads (CASSANDRA-9602)
 + * Fix potential ClassCastException while upgrading (CASSANDRA-10468)
 + * Fix NPE in MVs on update (CASSANDRA-10503)
 + * Only include modified cell data in indexing deltas (CASSANDRA-10438)
 + * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
 + * If node is not yet gossiping write all MV updates to batchlog only (CASSANDRA-10413)
 + * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
 + * Provide additional metrics for materialized views (CASSANDRA-10323)
 + * Flush system schema tables after local schema changes (CASSANDRA-10429)
 +Merged from 2.2:
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 + * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
   * Avoid NoClassDefFoundError during DataDescriptor initialization on windows (CASSANDRA-10412)
   * Preserve case of quoted Role & User names (CASSANDRA-10394)
   * cqlsh pg-style-strings broken (CASSANDRA-10484)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10c65d43/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
----------------------------------------------------------------------


Mime
View raw message