This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ba50ec9cd9f82a65cb70d08fbb30a1f41428d98a
Merge: fb395c6b8b 1dd38998a0
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Fri Aug 18 10:10:11 2023 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
.build/build-cqlsh.xml | 24 ++++++++++++++++++++++++
CHANGES.txt | 2 ++
bin/cqlsh.py | 11 +++++++++++
build.xml | 3 ++-
4 files changed, 39 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index 90f8f99dfe,7ee07ec953..a96137164e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,12 +1,26 @@@
-3.11.17
+4.0.12
+ * Fix NTS log message when an unrecognized strategy option is passed
(CASSANDRA-18679)
+ * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582)
+ * Migrate Python optparse to argparse (CASSANDRA-17914)
+Merged from 3.11:
+ * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
Merged from 3.0:
+ 3.0.30
+ * CQLSH emits a warning when the server version doesn't match
(CASSANDRA-18745)
* Fix missing speculative retries in tablestats (CASSANDRA-18767)
+ * Fix Requires for Java for RPM package (CASSANDRA-18751)
+ * Fix CQLSH online help topic link (CASSANDRA-17534)
+ * Remove unused suppressions (CASSANDRA-18724)
-3.11.16
- * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
+4.0.11
+ * Revert CASSANDRA-16718 (CASSANDRA-18560)
+ * Upgrade snappy to 1.1.10.1 (CASSANDRA-18608)
+ * Fix assertion error when describing mv as table (CASSANDRA-18596)
+ * Track the amount of read data per row (CASSANDRA-18513)
+ * Fix Down nodes counter in nodetool describecluster (CASSANDRA-18512)
+ * Remove unnecessary shuffling of GossipDigests in
Gossiper#makeRandomGossipDigest (CASSANDRA-18546)
+Merged from 3.11:
* Fix CAST function for float to decimal (CASSANDRA-18647)
* Suppress CVE-2022-45688 (CASSANDRA-18643)
* Remove unrepaired SSTables from garbage collection when
only_purge_repaired_tombstones is true (CASSANDRA-14204)
diff --cc bin/cqlsh.py
index 00bd00d134,a2f1a9e5ed..4ca4469604
mode 100755,100644..100755
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -511,11 -532,12 +512,13 @@@ class Shell(cmd.Cmd)
if stdin is None:
stdin = sys.stdin
+ self.check_build_versions()
+
if tty:
self.reset_prompt()
+ self.maybe_warn_py2()
self.report_connection()
- print 'Use HELP for help.'
+ print('Use HELP for help.')
else:
self.show_line_nums = True
self.stdin = stdin
diff --cc build.xml
index ec1aba8368,aa1fc02afc..0b914175bb
--- a/build.xml
+++ b/build.xml
@@@ -863,8 -660,42 +863,8 @@@
<echo message="${base.version}" />
</target>
- <!--
- Generate thrift code. We have targets to build java because
- Cassandra depends on it, and python because that is what the system
- tests run.
- -->
- <target name="check-gen-thrift-java">
- <uptodate property="thriftUpToDate"
srcfile="${interface.dir}/cassandra.thrift"
-
targetfile="${interface.thrift.gen-java}/org/apache/cassandra/thrift/Cassandra.java"
/>
- </target>
- <target name="gen-thrift-java" unless="thriftUpToDate"
depends="check-gen-thrift-java"
- description="Generate Thrift Java artifacts">
- <echo>Generating Thrift Java code from
${basedir}/interface/cassandra.thrift...</echo>
- <exec executable="thrift" dir="${basedir}/interface" failonerror="true">
- <arg line="--gen java:hashcode" />
- <arg line="-o ${interface.thrift.dir}" />
- <arg line="cassandra.thrift" />
- </exec>
- <antcall target="write-java-license-headers" />
- </target>
-
- <target name="gen-thrift-py" description="Generate Thrift Python
artifacts">
- <echo>Generating Thrift Python code from
${basedir}/interface/cassandra.thrift...</echo>
- <exec executable="thrift" dir="${basedir}/interface" failonerror="true">
- <arg line="--gen py" />
- <arg line="-o ${interface.thrift.dir}" />
- <arg line="cassandra.thrift" />
- </exec>
- <exec executable="thrift" dir="${basedir}/interface" failonerror="true">
- <arg line="--gen py:twisted" />
- <arg line="-o ${interface.thrift.dir}" />
- <arg line="cassandra.thrift" />
- </exec>
- </target>
-
<!-- create properties file with C version -->
- <target name="createVersionPropFile">
+ <target name="createVersionPropFile" depends="set-cqlsh-version">
<taskdef name="propertyfile"
classname="org.apache.tools.ant.taskdefs.optional.PropertyFile"/>
<mkdir dir="${version.properties.dir}"/>
<propertyfile file="${version.properties.dir}/version.properties">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
