Repository: cassandra Updated Branches: refs/heads/cassandra-3.11 bf0a4b9cd -> c3a19f355 refs/heads/trunk 8d2fa65f8 -> d23afc54d
"ignore" option is ignored in sstableloader patch by Varun Barala, reviewed by jasobrown for CASSANDRA-13721 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3a19f35 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3a19f35 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3a19f35 Branch: refs/heads/cassandra-3.11 Commit: c3a19f3554113682b4d37fe6a7f49bc810e5ddf6 Parents: bf0a4b9 Author: Jason Brown <[email protected]> Authored: Sun Jul 23 07:25:25 2017 -0700 Committer: Jason Brown <[email protected]> Committed: Sun Jul 23 07:25:25 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/LoaderOptions.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3a19f35/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index e7a10f5..7da9567 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.11.1 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721) * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652) * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3a19f35/src/java/org/apache/cassandra/tools/LoaderOptions.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/LoaderOptions.java b/src/java/org/apache/cassandra/tools/LoaderOptions.java index 8b3d852..38317b6 100644 --- a/src/java/org/apache/cassandra/tools/LoaderOptions.java +++ b/src/java/org/apache/cassandra/tools/LoaderOptions.java @@ -81,7 +81,7 @@ public class LoaderOptions public final int connectionsPerHost; public final EncryptionOptions.ServerEncryptionOptions serverEncOptions; public final Set<InetAddress> hosts; - public final Set<InetAddress> ignores = new HashSet<>(); + public final Set<InetAddress> ignores; LoaderOptions(Builder builder) { @@ -101,6 +101,7 @@ public class LoaderOptions connectionsPerHost = builder.connectionsPerHost; serverEncOptions = builder.serverEncOptions; hosts = builder.hosts; + ignores = builder.ignores; } static class Builder --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
