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

Merge branch 'cassandra-2.1' into cassandra-2.2

This commit is contained in:
Ariel Weisberg 2017-04-21 16:16:33 -04:00
parent 31590f5da1 572fef8a06
commit cba5c7fa8b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -18,6 +18,7 @@
* Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018) * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
* Commitlog replay may fail if last mutation is within 4 bytes of end of segment (CASSANDRA-13282) * Commitlog replay may fail if last mutation is within 4 bytes of end of segment (CASSANDRA-13282)
Merged from 2.1: Merged from 2.1:
* Set javac encoding to utf-8 (CASSANDRA-13466)
* Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147) * Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147)
* Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364) * Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364)
* Remove unused repositories (CASSANDRA-13278) * Remove unused repositories (CASSANDRA-13278)

5
build.xml
View File

@ -812,6 +812,7 @@
<!-- Order matters! --> <!-- Order matters! -->
<javac fork="true" <javac fork="true"
debug="true" debuglevel="${debuglevel}" debug="true" debuglevel="${debuglevel}"
encoding="utf-8"
destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}" destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}"
memorymaximumsize="512M"> memorymaximumsize="512M">
<src path="${interface.thrift.dir}/gen-java"/> <src path="${interface.thrift.dir}/gen-java"/>
@ -819,6 +820,7 @@
</javac> </javac>
<javac fork="true" <javac fork="true"
debug="true" debuglevel="${debuglevel}" debug="true" debuglevel="${debuglevel}"
encoding="utf-8"
destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}" destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}"
memorymaximumsize="512M"> memorymaximumsize="512M">
<src path="${build.src.java}"/> <src path="${build.src.java}"/>
@ -844,7 +846,7 @@
</path> </path>
<target name="stress-build" depends="build" description="build stress tool"> <target name="stress-build" depends="build" description="build stress tool">
<mkdir dir="${stress.build.classes}" /> <mkdir dir="${stress.build.classes}" />
<javac debug="true" debuglevel="${debuglevel}" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}"> <javac debug="true" debuglevel="${debuglevel}" encoding="utf-8" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
<src path="${stress.build.src}" /> <src path="${stress.build.src}" />
<classpath> <classpath>
<path refid="cassandra.classes" /> <path refid="cassandra.classes" />
@ -1177,6 +1179,7 @@
<javac <javac
debug="true" debug="true"
debuglevel="${debuglevel}" debuglevel="${debuglevel}"
encoding="utf-8"
destdir="${test.classes}" destdir="${test.classes}"
includeantruntime="true" includeantruntime="true"
source="${source.version}" source="${source.version}"