cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [05/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Mon, 26 Oct 2015 17:53:38 GMT
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/32f22a4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32f22a4e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32f22a4e

Branch: refs/heads/cassandra-3.0
Commit: 32f22a4e35cd38c5a539a0bff47e1fe3edd86e61
Parents: 013ce88 17082d4
Author: Yuki Morishita <yukim@apache.org>
Authored: Mon Oct 26 12:19:13 2015 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Mon Oct 26 12:19:13 2015 -0500

----------------------------------------------------------------------
 .../db/compaction/CompactionManager.java        | 50 +++++++++++++-------
 .../cassandra/service/StorageService.java       |  3 ++
 2 files changed, 37 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f22a4e/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index ea20a1f,b85eb51..0c6e24f
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -20,22 -20,16 +20,8 @@@ package org.apache.cassandra.db.compact
  import java.io.File;
  import java.io.IOException;
  import java.lang.management.ManagementFactory;
--import java.util.ArrayList;
 -import java.util.Arrays;
--import java.util.Collection;
--import java.util.Collections;
--import java.util.HashSet;
--import java.util.Iterator;
--import java.util.List;
--import java.util.Map;
--import java.util.Set;
- import java.util.UUID;
- import java.util.concurrent.BlockingQueue;
- import java.util.concurrent.Callable;
- import java.util.concurrent.ExecutionException;
- import java.util.concurrent.Future;
- import java.util.concurrent.LinkedBlockingQueue;
- import java.util.concurrent.SynchronousQueue;
- import java.util.concurrent.TimeUnit;
++import java.util.*;
+ import java.util.concurrent.*;
  import javax.management.MBeanServer;
  import javax.management.ObjectName;
  import javax.management.openmbean.OpenDataException;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f22a4e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message