cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [08/14] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 02 Mar 2016 13:24:14 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: d1f6a1d95168534ab8e144b821e864e0a4c25b09
Parents: 477014b 0129f70
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Wed Mar 2 14:19:16 2016 +0100
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed Mar 2 14:19:16 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                            |  1 +
 .../apache/cassandra/io/sstable/SSTableRewriter.java   | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1f6a1d9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a50f256,eed9035..481916b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 -2.1.14
 +2.2.6
 + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
 + * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 + * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
 + * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
 + * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840)
 + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
 + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
 + * Protect from keyspace dropped during repair (CASSANDRA-11065)
 + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
 + * Better error message for cleanup (CASSANDRA-10991)
 + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
 + * Use cloned TokenMetadata in size estimates to avoid race against membership check
 +   (CASSANDRA-10736)
 + * Always persist upsampled index summaries (CASSANDRA-10512)
 + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
 + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
 + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281)
 + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
 + * Fix paging on DISTINCT queries repeats result when first row in partition changes
 +   (CASSANDRA-10010)
 +Merged from 2.1:
+  * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
   * Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
   * Only notify if repair status changed (CASSANDRA-11172)
   * Add partition key to TombstoneOverwhelmingException error message (CASSANDRA-10888)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1f6a1d9/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------


Mime
View raw message