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.11

This commit is contained in:
Michael Shuler 2019-01-14 11:39:15 -06:00
parent 6f2794fc47 24a708dbcd
commit 6a7aa0f07e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -34,6 +34,8 @@ Merged from 3.0:
* MigrationManager attempts to pull schema from different major version nodes (CASSANDRA-14928) * MigrationManager attempts to pull schema from different major version nodes (CASSANDRA-14928)
* Fix incorrect cqlsh results when selecting same columns multiple times (CASSANDRA-13262) * Fix incorrect cqlsh results when selecting same columns multiple times (CASSANDRA-13262)
* Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377) * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
Merged from 2.1:
* Update release checksum algorithms to SHA-256, SHA-512 (CASSANDRA-14970)
3.11.3 3.11.3

8
build.xml
View File

@ -1142,14 +1142,14 @@
<target name="release" depends="eclipse-warnings,artifacts,rat-init" <target name="release" depends="eclipse-warnings,artifacts,rat-init"
description="Create and QC release artifacts"> description="Create and QC release artifacts">
<checksum forceOverwrite="yes" todir="${build.dir}" fileext=".md5" <checksum forceOverwrite="yes" todir="${build.dir}" fileext=".sha256"
algorithm="MD5"> algorithm="SHA-256">
<fileset dir="${build.dir}"> <fileset dir="${build.dir}">
<include name="*.tar.gz" /> <include name="*.tar.gz" />
</fileset> </fileset>
</checksum> </checksum>
<checksum forceOverwrite="yes" todir="${build.dir}" fileext=".sha" <checksum forceOverwrite="yes" todir="${build.dir}" fileext=".sha512"
algorithm="SHA"> algorithm="SHA-512">
<fileset dir="${build.dir}"> <fileset dir="${build.dir}">
<include name="*.tar.gz" /> <include name="*.tar.gz" />
</fileset> </fileset>