This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from dd4e3fa6df Merge branch 'cassandra-5.0' into trunk
add 334ca05730 Make nodetool import congruent with the documentation by
not relying on the folder structure of the imported SSTable files
add 85039aa8c5 Merge branch 'cassandra-4.0' into cassandra-4.1
add d1101eeccc Merge branch 'cassandra-4.1' into cassandra-5.0
new 48f6a31879 Merge branch 'cassandra-5.0' into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Directories.java | 55 ++++++++++++++----
.../org/apache/cassandra/db/SSTableImporter.java | 4 +-
test/unit/org/apache/cassandra/db/ImportTest.java | 66 ++++++++++++++++++++--
4 files changed, 109 insertions(+), 17 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
