This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit b774385b40fd53c64dc9b8847d3dad9056277eeb
Merge: 881bb56be7 75f7ec7fa5
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Wed Aug 9 23:16:52 2023 +0200

    Merge branch 'cassandra-5.0' into trunk

 CHANGES.txt                                        |   1 +
 NEWS.txt                                           |   2 +
 .../pages/managing/tools/cassandra_stress.adoc     |   5 +-
 tools/stress/README.txt                            |   7 +-
 .../operations/predefined/PredefinedOperation.java |   5 +-
 .../apache/cassandra/stress/settings/Command.java  |   3 -
 .../apache/cassandra/stress/settings/Legacy.java   | 346 ---------------------
 .../cassandra/stress/settings/SettingsMode.java    | 119 +++----
 .../cassandra/stress/settings/StressSettings.java  |   2 -
 9 files changed, 61 insertions(+), 429 deletions(-)

diff --cc CHANGES.txt
index 697244db1c,20319cfa78..969b959e01
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -5.0
 +5.1
 +Merged from 5.0:
+  * Remove legacy command line options from cassandra-stress (CASSANDRA-18529)
   * Remove commitlog_sync_batch_window_in_ms (CASSANDRA-17161)
   * Upgrade JMH from 1.21 to 1.36 (CASSANDRA-18696)
   * Add guardrail for vector dimensions (CASSANDRA-18730)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to