Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 6ff56c30e -> 15b52809f refs/heads/cassandra-3.11 b52c82045 -> 1553d864b refs/heads/cassandra-3.X 699eff071 -> 0d813176a refs/heads/trunk 87b0b36c7 -> 2d56fee4f
Fix tabs and typo patch by Jay Zhuang; reviewed by Stefania Alborghetti for CASSANDRA-11431 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15b52809 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15b52809 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15b52809 Branch: refs/heads/cassandra-3.0 Commit: 15b52809f2f10a37a753a7d6734e71f7c3dc521d Parents: d98446e Author: Jay Zhuang <jay.zhu...@yahoo.com> Authored: Mon Jan 9 08:28:36 2017 +0100 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Wed Jan 11 08:10:41 2017 +0100 ---------------------------------------------------------------------- build.xml | 6 +++--- .../org/apache/cassandra/db/ColumnFamilyStoreCQLHelper.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15b52809/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 9755f02..2d33de6 100644 --- a/build.xml +++ b/build.xml @@ -758,8 +758,8 @@ memorymaximumsize="512M"> <src path="${build.src.java}"/> <src path="${build.src.gen-java}"/> - <compilerarg value="-XDignore.symbol.file"/> - <compilerarg value="-Xbootclasspath/p:${build.src.jdkoverride}"/> + <compilerarg value="-XDignore.symbol.file"/> + <compilerarg value="-Xbootclasspath/p:${build.src.jdkoverride}"/> <classpath refid="cassandra.classpath"/> </javac> <antcall target="createVersionPropFile"/> @@ -1120,7 +1120,7 @@ <classpath> <path refid="cassandra.classpath"/> </classpath> - <compilerarg value="-XDignore.symbol.file"/> + <compilerarg value="-XDignore.symbol.file"/> <src path="${test.unit.src}"/> <src path="${test.long.src}"/> <src path="${test.burn.src}"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/15b52809/src/java/org/apache/cassandra/db/ColumnFamilyStoreCQLHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStoreCQLHelper.java b/src/java/org/apache/cassandra/db/ColumnFamilyStoreCQLHelper.java index f9d6897..5dc9324 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStoreCQLHelper.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStoreCQLHelper.java @@ -1,5 +1,5 @@ /* - * Licensed to the Apache Softwâ¤are Foundation (ASF) under one + * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file