Merge branch 'cassandra-3.0' into cassandra-3.X

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

Branch: refs/heads/cassandra-3.X
Commit: 72d0c814cf28fe8797c184fd87e2a9c7cc7695e7
Parents: 3bf043e 7d3062f
Author: Jeff Jirsa <jeff.ji...@crowdstrike.com>
Authored: Tue Oct 18 18:11:17 2016 -0700
Committer: Jeff Jirsa <jeff.ji...@crowdstrike.com>
Committed: Tue Oct 18 18:12:23 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                             | 1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/72d0c814/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index dc98ca7,bd186a1..9c39e6f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -104,21 -16,9 +104,22 @@@ Merged from 3.0
   * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
   * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
   * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 - * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * Handle composite prefixes with final EOC=0 as in 2.x and refactor 
LegacyLayout.decodeBound (CASSANDRA-12423)
 + * select_distinct_with_deletions_test failing on non-vnode environments 
(CASSANDRA-11126)
 + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
 + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata 
(CASSANDRA-12208)
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
   * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
+  * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
  Merged from 2.2:
   * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
   * Limit colUpdateTimeDelta histogram updates to reasonable deltas 
(CASSANDRA-11117)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/72d0c814/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------

Reply via email to