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/085564e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/085564e5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/085564e5 Branch: refs/heads/trunk Commit: 085564e5c777e1a6f6e903d2890f24c6c9b7d6a3 Parents: 7886bd3 9b35640 Author: Jeff Jirsa <jeff.ji...@crowdstrike.com> Authored: Wed Oct 19 20:43:26 2016 -0700 Committer: Jeff Jirsa <jeff.ji...@crowdstrike.com> Committed: Wed Oct 19 20:44:38 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 2 +- src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java | 3 ++- src/java/org/apache/cassandra/thrift/ThriftConversion.java | 2 +- src/java/org/apache/cassandra/utils/CoalescingStrategies.java | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/085564e5/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 30caf4f,933ee61..cdb2d1d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -105,22 -17,10 +105,23 @@@ 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) - * Explicitly set locale for string comparisons (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543) ++ * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545) 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/085564e5/src/java/org/apache/cassandra/thrift/ThriftConversion.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/085564e5/src/java/org/apache/cassandra/utils/CoalescingStrategies.java ----------------------------------------------------------------------
