You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by pa...@apache.org on 2018/01/25 20:28:20 UTC
cassandra git commit: ninja: fix bad CASSANDRA-14082 merge from 3.11
Repository: cassandra
Updated Branches:
refs/heads/trunk 59b5b6bef -> 6fc3699ad
ninja: fix bad CASSANDRA-14082 merge from 3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6fc3699a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fc3699a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fc3699a
Branch: refs/heads/trunk
Commit: 6fc3699adb4f609f78a40888af9797bb205216b0
Parents: 59b5b6b
Author: Paulo Motta <pa...@apache.org>
Authored: Thu Jan 25 18:24:50 2018 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Thu Jan 25 18:24:50 2018 -0200
----------------------------------------------------------------------
.../apache/cassandra/db/compaction/CompactionStrategyManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fc3699a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
index 7ad6e91..61f0630 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
@@ -745,7 +745,7 @@ public class CompactionStrategyManager implements INotificationConsumer
readLock.lock();
try
{
- getCompactionStrategyFor(deleted).removeSSTable(deleted);
+ compactionStrategyFor(deleted).removeSSTable(deleted);
}
finally
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org