natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.X' into trunk

This commit is contained in:
Stefania Alborghetti 2017-01-11 08:17:06 +01:00
parent 87b0b36c75 0d813176af
commit 2d56fee4f5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.xml
View File

@ -721,8 +721,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"/>
@ -1044,7 +1044,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}"/>

2
src/java/org/apache/cassandra/db/ColumnFamilyStoreCQLHelper.java
View File

@ -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