cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Mon, 08 Feb 2016 15:42:29 GMT
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 1d7f3129ad95f5303c0fc71d00e5764b5e53424e
Parents: 1e6e3d4 15092e6
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Mon Feb 8 15:42:08 2016 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Mon Feb 8 15:42:08 2016 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../io/sstable/format/SSTableReader.java        | 17 +++++----
 .../apache/cassandra/utils/concurrent/Ref.java  | 15 ++++++--
 .../utils/concurrent/RefCountedTest.java        | 36 ++++++++++++++++++++
 4 files changed, 60 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d7f3129/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8351032,03a8bc8..0f1b4d3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
 -3.0.4
 +3.4
 + * Add LIKE support to CQL3 (CASSANDRA-11067)
 + * Generic Java UDF types (CASSANDRA-10819)
 + * cqlsh: Include sub-second precision in timestamps by default (CASSANDRA-10428)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Integrate SASI index into Cassandra (CASSANDRA-10661)
 + * Add --skip-flush option to nodetool snapshot
 + * Skip values for non-queried columns (CASSANDRA-10657)
 + * Add support for secondary indexes on static columns (CASSANDRA-8103)
 + * CommitLogUpgradeTestMaker creates broken commit logs (CASSANDRA-11051)
 + * Add metric for number of dropped mutations (CASSANDRA-10866)
 + * Simplify row cache invalidation code (CASSANDRA-10396)
 + * Support user-defined compaction through nodetool (CASSANDRA-10660)
 + * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981)
 + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953)
 + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838)
 +Merged from 3.0:
+  * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120)
   * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062)
   * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001)
  Merged from 2.2.6

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d7f3129/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
----------------------------------------------------------------------


Mime
View raw message