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 7b891db36d4bcfa116ee04e3f4b3f31af798d5b2
Merge: 37d2ef11d6 5b3c36b28a
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Wed Nov 8 14:32:15 2023 +0100
Merge branch 'cassandra-5.0' into trunk
.../apache/cassandra/hints/HintsDescriptor.java | 3 +
.../3.0.13-encrypted/CommitLog-6-1699284515156.log | Bin 0 -> 1048576 bytes
.../3.0.13-encrypted/CommitLog-6-1699284515157.log | Bin 0 -> 1048576 bytes
.../legacy-commitlog/3.0.13-encrypted/hash.txt | 5 +
.../3.0.29-encrypted/CommitLog-6-1699279786262.log | Bin 0 -> 1048576 bytes
.../legacy-commitlog/3.0.29-encrypted/hash.txt | 5 +
.../4.0.11-encrypted/CommitLog-7-1699285478684.log | Bin 0 -> 1048576 bytes
.../legacy-commitlog/4.0.11-encrypted/hash.txt | 5 +
...64-4615-8765-3401a89d050f-1699312935941-1.crc32 | 1 +
...64-4615-8765-3401a89d050f-1699312935941-1.hints | Bin 0 -> 1048914 bytes
test/data/legacy-hints/3.0.29/hash.txt | 7 +
...b5-46a9-a83d-2ce5a636d531-1699365476115-2.crc32 | 1 +
...b5-46a9-a83d-2ce5a636d531-1699365476115-2.hints | Bin 0 -> 1048614 bytes
test/data/legacy-hints/4.1.3/hash.txt | 7 +
.../db/commitlog/CommitLogUpgradeTest.java | 22 ++
.../org/apache/cassandra/hints/HintsMaker.java | 257 +++++++++++++++++++++
.../apache/cassandra/hints/HintsUpgradeTest.java | 197 ++++++++++++++++
17 files changed, 510 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
