You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by aw...@apache.org on 2017/02/21 19:20:03 UTC

[01/10] cassandra git commit: Correct CHANGES.txt for CASSANDRA-13090

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 3f4501077 -> c6462d793
  refs/heads/cassandra-3.0 0020e79f8 -> 502226474
  refs/heads/cassandra-3.11 87e8c6be7 -> c382a900b
  refs/heads/trunk f97db26f8 -> bda973264


Correct CHANGES.txt for CASSANDRA-13090

Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13090


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

Branch: refs/heads/cassandra-2.2
Commit: c6462d793b5736b7728c6f188b224dd9d3760bc6
Parents: 3f45010
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 21 12:04:49 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 21 12:04:49 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6462d79/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7073356..78f55f6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,7 +3,7 @@
  * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
 
 2.2.9
- * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090)
+ * Coalescing strategy sleeps too much (CASSANDRA-13090)
  * Fix negative mean latency metric (CASSANDRA-12876)
  * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
  * Fix speculative retry bugs (CASSANDRA-13009)


[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by aw...@apache.org.
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/50222647
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50222647
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50222647

Branch: refs/heads/cassandra-3.0
Commit: 50222647481396c15d2465eced02c007f1493b53
Parents: 0020e79 c6462d7
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 21 12:13:55 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 21 12:13:55 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/50222647/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 922e7f7,78f55f6..f2419d6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -3,48 -2,8 +3,48 @@@ Merged from 2.
   * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
   * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
  
 -2.2.9
 +3.0.11
 + * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in addition to 
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message (CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
-  * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090)
+  * Coalescing strategy sleeps too much (CASSANDRA-13090)
   * Fix negative mean latency metric (CASSANDRA-12876)
   * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
   * Fix speculative retry bugs (CASSANDRA-13009)


[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by aw...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: c382a900b8059303f5ee1632650bc560e40c7cdf
Parents: 87e8c6b 5022264
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 21 12:17:02 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 21 12:17:02 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c382a900/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a98e43d,f2419d6..846fc20
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -219,21 -107,6 +219,21 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
   * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
-  * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090)
++ * Coalescing strategy sleeps too much (CASSANDRA-13090)
 + * Fix speculative retry bugs (CASSANDRA-13009)
 + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
 + * Fix race causing infinite loop if Thrift server is stopped before it starts listening (CASSANDRA-12856)
 + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979)
 + * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
 + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074)
 + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
 + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
 + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
 + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
 + * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
 + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
 + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)


[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by aw...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: c382a900b8059303f5ee1632650bc560e40c7cdf
Parents: 87e8c6b 5022264
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 21 12:17:02 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 21 12:17:02 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c382a900/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a98e43d,f2419d6..846fc20
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -219,21 -107,6 +219,21 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
   * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
-  * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090)
++ * Coalescing strategy sleeps too much (CASSANDRA-13090)
 + * Fix speculative retry bugs (CASSANDRA-13009)
 + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
 + * Fix race causing infinite loop if Thrift server is stopped before it starts listening (CASSANDRA-12856)
 + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979)
 + * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
 + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074)
 + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
 + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
 + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
 + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
 + * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
 + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
 + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)


[04/10] cassandra git commit: Correct CHANGES.txt for CASSANDRA-13090

Posted by aw...@apache.org.
Correct CHANGES.txt for CASSANDRA-13090

Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13090


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

Branch: refs/heads/trunk
Commit: c6462d793b5736b7728c6f188b224dd9d3760bc6
Parents: 3f45010
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 21 12:04:49 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 21 12:04:49 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6462d79/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7073356..78f55f6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,7 +3,7 @@
  * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
 
 2.2.9
- * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090)
+ * Coalescing strategy sleeps too much (CASSANDRA-13090)
  * Fix negative mean latency metric (CASSANDRA-12876)
  * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
  * Fix speculative retry bugs (CASSANDRA-13009)


[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

Posted by aw...@apache.org.
Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: bda973264d157485253742d2364c6c6467eea0b1
Parents: f97db26 c382a90
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 21 12:17:31 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 21 12:17:31 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bda97326/CHANGES.txt
----------------------------------------------------------------------


[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by aw...@apache.org.
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/50222647
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50222647
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50222647

Branch: refs/heads/trunk
Commit: 50222647481396c15d2465eced02c007f1493b53
Parents: 0020e79 c6462d7
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 21 12:13:55 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 21 12:13:55 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/50222647/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 922e7f7,78f55f6..f2419d6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -3,48 -2,8 +3,48 @@@ Merged from 2.
   * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
   * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
  
 -2.2.9
 +3.0.11
 + * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in addition to 
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message (CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
-  * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090)
+  * Coalescing strategy sleeps too much (CASSANDRA-13090)
   * Fix negative mean latency metric (CASSANDRA-12876)
   * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
   * Fix speculative retry bugs (CASSANDRA-13009)


[03/10] cassandra git commit: Correct CHANGES.txt for CASSANDRA-13090

Posted by aw...@apache.org.
Correct CHANGES.txt for CASSANDRA-13090

Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13090


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

Branch: refs/heads/cassandra-3.11
Commit: c6462d793b5736b7728c6f188b224dd9d3760bc6
Parents: 3f45010
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 21 12:04:49 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 21 12:04:49 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6462d79/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7073356..78f55f6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,7 +3,7 @@
  * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
 
 2.2.9
- * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090)
+ * Coalescing strategy sleeps too much (CASSANDRA-13090)
  * Fix negative mean latency metric (CASSANDRA-12876)
  * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
  * Fix speculative retry bugs (CASSANDRA-13009)


[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by aw...@apache.org.
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/50222647
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50222647
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50222647

Branch: refs/heads/cassandra-3.11
Commit: 50222647481396c15d2465eced02c007f1493b53
Parents: 0020e79 c6462d7
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 21 12:13:55 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 21 12:13:55 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/50222647/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 922e7f7,78f55f6..f2419d6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -3,48 -2,8 +3,48 @@@ Merged from 2.
   * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
   * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
  
 -2.2.9
 +3.0.11
 + * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in addition to 
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message (CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
-  * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090)
+  * Coalescing strategy sleeps too much (CASSANDRA-13090)
   * Fix negative mean latency metric (CASSANDRA-12876)
   * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
   * Fix speculative retry bugs (CASSANDRA-13009)


[02/10] cassandra git commit: Correct CHANGES.txt for CASSANDRA-13090

Posted by aw...@apache.org.
Correct CHANGES.txt for CASSANDRA-13090

Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13090


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

Branch: refs/heads/cassandra-3.0
Commit: c6462d793b5736b7728c6f188b224dd9d3760bc6
Parents: 3f45010
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 21 12:04:49 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 21 12:04:49 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6462d79/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7073356..78f55f6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,7 +3,7 @@
  * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
 
 2.2.9
- * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090)
+ * Coalescing strategy sleeps too much (CASSANDRA-13090)
  * Fix negative mean latency metric (CASSANDRA-12876)
  * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
  * Fix speculative retry bugs (CASSANDRA-13009)