You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by dj...@apache.org on 2020/06/23 17:59:41 UTC
[cassandra] branch trunk updated (1731e2f -> 8368541)
This is an automated email from the ASF dual-hosted git repository.
djoshi pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 1731e2f Several mbeans are not unregistered when dropping a keyspace and table
add c971aaf Fix flaky unit test CorruptedSSTablesCompactionsTest
add c8a40b8 Merge branch 'cassandra-3.0' into cassandra-3.11
new 8368541 Merge branch 'cassandra-3.11' 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:
.../cassandra/db/compaction/CorruptedSSTablesCompactionsTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk
Posted by dj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
djoshi pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 83685418f9061c08af7e59a5b88d1ea14de5c2a9
Merge: 1731e2f c8a40b8
Author: Dinesh A. Joshi <di...@apple.com>
AuthorDate: Tue Jun 23 10:55:22 2020 -0700
Merge branch 'cassandra-3.11' into trunk
.../cassandra/db/compaction/CorruptedSSTablesCompactionsTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --cc test/unit/org/apache/cassandra/db/compaction/CorruptedSSTablesCompactionsTest.java
index 7b10019,231c2b5..95542a1
--- a/test/unit/org/apache/cassandra/db/compaction/CorruptedSSTablesCompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CorruptedSSTablesCompactionsTest.java
@@@ -149,9 -152,9 +152,9 @@@ public class CorruptedSSTablesCompactio
{
for (int i = 0; i < ROWS_PER_SSTABLE; i++)
{
- DecoratedKey key = Util.dk(String.valueOf(i));
+ DecoratedKey key = Util.dk(String.valueOf(i), LongType.instance);
long timestamp = j * ROWS_PER_SSTABLE + i;
- new RowUpdateBuilder(cfs.metadata, timestamp, key.getKey())
+ new RowUpdateBuilder(cfs.metadata(), timestamp, key.getKey())
.clustering(Long.valueOf(i))
.add("val", Long.valueOf(i))
.build()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org