Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/426109c5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/426109c5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/426109c5 Branch: refs/heads/cassandra-2.2 Commit: 426109c50bf7f264c1965dd77482c161cbec0242 Parents: 5b05b68 588dc06 Author: Yuki Morishita <yu...@apache.org> Authored: Wed Sep 16 08:39:29 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Sep 16 08:39:29 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/utils/FBUtilities.java | 16 ++++++++++++++-- .../apache/cassandra/utils/FBUtilitiesTest.java | 19 +++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/426109c5/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7b5fa78,2787739..7deebcf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ -2.1.10 +2.2.2 + * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761) + * Cancel transaction for sstables we wont redistribute index summary + for (CASSANDRA-10270) + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) + * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222) + * Fix failure to start with space in directory path on Windows (CASSANDRA-10239) + * Fix repair hang when snapshot failed (CASSANDRA-10057) + * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks + (CASSANDRA-10199) +Merged from 2.1: + * Fix NPE in nodetool compactionhistory (CASSANDRA-9758) * (Pig) support BulkOutputFormat as a URL parameter (CASSANDRA-7410) * BATCH statement is broken in cqlsh (CASSANDRA-10272) * Added configurable warning threshold for GC duration (CASSANDRA-8907) http://git-wip-us.apache.org/repos/asf/cassandra/blob/426109c5/src/java/org/apache/cassandra/utils/FBUtilities.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/utils/FBUtilities.java index b41bdab,f866610..6ef64ef --- a/src/java/org/apache/cassandra/utils/FBUtilities.java +++ b/src/java/org/apache/cassandra/utils/FBUtilities.java @@@ -26,14 -28,19 +26,16 @@@ import java.net.* import java.nio.ByteBuffer; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; - import java.text.NumberFormat; import java.util.*; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; +import java.util.concurrent.*; +import java.util.zip.Adler32; import java.util.zip.Checksum; + import javax.annotation.Nonnull; + import javax.annotation.Nullable; + import com.google.common.base.Joiner; import com.google.common.collect.AbstractIterator; -import org.apache.cassandra.io.util.FileUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
