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.0' into cassandra-3.9

This commit is contained in:
Tyler Hobbs 2016-08-11 13:47:11 -05:00
parent 02f48c8659 2a828afdbf
commit f4c3e14fde
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -82,6 +82,7 @@ Merged from 3.0:
* Avoid digest mismatch with empty but static rows (CASSANDRA-12090) * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
* Fix EOF exception when altering column type (CASSANDRA-11820) * Fix EOF exception when altering column type (CASSANDRA-11820)
Merged from 2.2: Merged from 2.2:
* Add Sigar to classes included in clientutil.jar (CASSANDRA-11635)
* Add decay to histograms and timers used for metrics (CASSANDRA-11752) * Add decay to histograms and timers used for metrics (CASSANDRA-11752)
* Fix hanging stream session (CASSANDRA-10992) * Fix hanging stream session (CASSANDRA-10992)
* Fix INSERT JSON, fromJson() support of smallint, tinyint types (CASSANDRA-12371) * Fix INSERT JSON, fromJson() support of smallint, tinyint types (CASSANDRA-12371)

4
build.xml
View File

@ -931,6 +931,7 @@
<include name="org/apache/cassandra/exceptions/*.class" /> <include name="org/apache/cassandra/exceptions/*.class" />
<include name="org/apache/cassandra/utils/CloseableIterator.class" /> <include name="org/apache/cassandra/utils/CloseableIterator.class" />
<include name="org/apache/cassandra/io/util/*.class" /> <include name="org/apache/cassandra/io/util/*.class" />
<include name="org/apache/cassandra/utils/SigarLibrary.class" />
</fileset> </fileset>
<manifest> <manifest>
<attribute name="Implementation-Title" value="Cassandra"/> <attribute name="Implementation-Title" value="Cassandra"/>
@ -1287,6 +1288,8 @@
--> -->
<target name="test-clientutil-jar" depends="build-test,jar" description="Test clientutil jar"> <target name="test-clientutil-jar" depends="build-test,jar" description="Test clientutil jar">
<junit fork="on" forkmode="perTest" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}"> <junit fork="on" forkmode="perTest" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
<!-- Note that the test pass without that next line, but it prints an ugly error message -->
<jvmarg value="-Djava.library.path=${build.lib}/sigar-bin"/>
<test name="org.apache.cassandra.serializers.ClientUtilsTest" /> <test name="org.apache.cassandra.serializers.ClientUtilsTest" />
<formatter type="brief" usefile="false" /> <formatter type="brief" usefile="false" />
<classpath> <classpath>
@ -1300,6 +1303,7 @@
<pathelement location="${build.lib}/logback-classic-1.1.3.jar" /> <pathelement location="${build.lib}/logback-classic-1.1.3.jar" />
<pathelement location="${build.lib}/jackson-core-asl-1.9.2.jar" /> <pathelement location="${build.lib}/jackson-core-asl-1.9.2.jar" />
<pathelement location="${build.lib}/jackson-mapper-asl-1.9.2.jar" /> <pathelement location="${build.lib}/jackson-mapper-asl-1.9.2.jar" />
<pathelement location="${build.lib}/sigar-1.6.4.jar" />
<fileset dir="${build.dir.lib}"> <fileset dir="${build.dir.lib}">
<include name="**/junit*.jar" /> <include name="**/junit*.jar" />
</fileset> </fileset>