You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jj...@apache.org on 2017/03/03 05:38:33 UTC
[1/3] cassandra git commit: Supplemental Ninja: Address message
coalescing regression - Update yaml
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 10154272e -> ff170af2a
refs/heads/trunk b300cc4d5 -> a49cf2c6c
Supplemental Ninja: Address message coalescing regression - Update yaml
Patch by Jeff Jirsa following CASSANDRA-12676
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff170af2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff170af2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff170af2
Branch: refs/heads/cassandra-3.11
Commit: ff170af2a2879e1b195f0ea9df540b83b07caad8
Parents: 1015427
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Thu Mar 2 21:36:34 2017 -0800
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Thu Mar 2 21:36:34 2017 -0800
----------------------------------------------------------------------
conf/cassandra.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff170af2/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 90e28b2..7e1c761 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -1209,9 +1209,9 @@ back_pressure_strategy:
# See CASSANDRA-8692 for details.
# Strategy to use for coalescing messages in OutboundTcpConnection.
-# Can be fixed, movingaverage, timehorizon (default), disabled.
+# Can be fixed, movingaverage, timehorizon, disabled (default).
# You can also specify a subclass of CoalescingStrategies.CoalescingStrategy by name.
-# otc_coalescing_strategy: TIMEHORIZON
+# otc_coalescing_strategy: DISABLED
# How many microseconds to wait for coalescing. For fixed strategy this is the amount of time after the first
# message is received before it will be sent with any accompanying messages. For moving average this is the
[2/3] cassandra git commit: Supplemental Ninja: Address message
coalescing regression - Update yaml
Posted by jj...@apache.org.
Supplemental Ninja: Address message coalescing regression - Update yaml
Patch by Jeff Jirsa following CASSANDRA-12676
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff170af2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff170af2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff170af2
Branch: refs/heads/trunk
Commit: ff170af2a2879e1b195f0ea9df540b83b07caad8
Parents: 1015427
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Thu Mar 2 21:36:34 2017 -0800
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Thu Mar 2 21:36:34 2017 -0800
----------------------------------------------------------------------
conf/cassandra.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff170af2/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 90e28b2..7e1c761 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -1209,9 +1209,9 @@ back_pressure_strategy:
# See CASSANDRA-8692 for details.
# Strategy to use for coalescing messages in OutboundTcpConnection.
-# Can be fixed, movingaverage, timehorizon (default), disabled.
+# Can be fixed, movingaverage, timehorizon, disabled (default).
# You can also specify a subclass of CoalescingStrategies.CoalescingStrategy by name.
-# otc_coalescing_strategy: TIMEHORIZON
+# otc_coalescing_strategy: DISABLED
# How many microseconds to wait for coalescing. For fixed strategy this is the amount of time after the first
# message is received before it will be sent with any accompanying messages. For moving average this is the
[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by jj...@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/a49cf2c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a49cf2c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a49cf2c6
Branch: refs/heads/trunk
Commit: a49cf2c6ccc8f269858958c86e2437429cd5ca59
Parents: b300cc4 ff170af
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Thu Mar 2 21:37:39 2017 -0800
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Thu Mar 2 21:38:14 2017 -0800
----------------------------------------------------------------------
conf/cassandra.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a49cf2c6/conf/cassandra.yaml
----------------------------------------------------------------------