cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Thu, 20 Oct 2016 04:00:09 GMT
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: e6e82a79a98951041b94df915b3d09a89d189720
Parents: 2d559fd 085564e
Author: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Authored: Wed Oct 19 20:44:48 2016 -0700
Committer: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Committed: Wed Oct 19 20:51:29 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java  | 2 +-
 src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java | 5 +++--
 src/java/org/apache/cassandra/thrift/ThriftConversion.java      | 4 ++--
 src/java/org/apache/cassandra/utils/CoalescingStrategies.java   | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6e82a79/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
index 58c6375,a10a1d3..43447f0
--- a/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
+++ b/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
@@@ -100,7 -101,7 +101,7 @@@ public final class SpeculativeRetryPara
              }
          }
  
--        if (value.toUpperCase().endsWith(Kind.PERCENTILE.toString()))
++        if (value.toUpperCase(Locale.ENGLISH).endsWith(Kind.PERCENTILE.toString()))
          {
              double threshold;
              try

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6e82a79/src/java/org/apache/cassandra/thrift/ThriftConversion.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/thrift/ThriftConversion.java
index 35adddf,55a28ee..0c5c4be
--- a/src/java/org/apache/cassandra/thrift/ThriftConversion.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftConversion.java
@@@ -675,7 -675,7 +675,7 @@@ public class ThriftConversio
  
      private static CachingParams cachingFromTrhfit(String caching)
      {
--        switch (caching.toUpperCase())
++        switch (caching.toUpperCase(Locale.ENGLISH))
          {
              case "ALL":
                  return CachingParams.CACHE_EVERYTHING;


Mime
View raw message