cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cassandra git commit: Ninja: remove merge conflict artifacts in javadoc
Date Fri, 08 Sep 2017 08:54:38 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 9c5bc36a7 -> 6651b0271


Ninja: remove merge conflict artifacts in javadoc


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

Branch: refs/heads/trunk
Commit: 6651b027149ff4970785820f93c4470116da15c1
Parents: 9c5bc36
Author: Stefan Podkowinski <stefan.podkowinski@1und1.de>
Authored: Fri Sep 8 10:51:07 2017 +0200
Committer: Stefan Podkowinski <stefan.podkowinski@1und1.de>
Committed: Fri Sep 8 10:51:07 2017 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/config/Config.java | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6651b027/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index 537cf39..55f70f0 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -270,17 +270,13 @@ public class Config
     public int tracetype_repair_ttl = (int) TimeUnit.DAYS.toSeconds(7);
 
     /**
-<<<<<<< HEAD
      * Maintain statistics on whether writes achieve the ideal consistency level
      * before expiring and becoming hints
      */
     public volatile ConsistencyLevel ideal_consistency_level = null;
 
     /*
-     * Strategy to use for coalescing messages in OutboundTcpConnection.
-=======
      * Strategy to use for coalescing messages in {@link OutboundMessagingPool}.
->>>>>>> 2acc8dbc74... switch internode messaging to netty
      * Can be fixed, movingaverage, timehorizon, disabled. Setting is case and leading/trailing
      * whitespace insensitive. You can also specify a subclass of
      * {@link org.apache.cassandra.utils.CoalescingStrategies.CoalescingStrategy} by name.


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message