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 56dbc68528c92b9ccaaa34ab19640a7613124828 Merge: 067f4c7461 67632edc51 Author: Stefan Miklosovic <[email protected]> AuthorDate: Mon Jun 13 10:57:49 2022 +0200 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 1 + .../cassandra/tools/BulkLoadConnectionFactory.java | 19 +++++++++---------- src/java/org/apache/cassandra/tools/BulkLoader.java | 8 +++----- .../org/apache/cassandra/tools/LoaderOptions.java | 15 --------------- .../cassandra/utils/NativeSSTableLoaderClient.java | 5 ++--- .../test/SSTableLoaderEncryptionOptionsTest.java | 6 ++++-- .../org/apache/cassandra/tools/BulkLoaderTest.java | 10 +++++----- 7 files changed, 24 insertions(+), 40 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
