cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X
Date Tue, 08 Nov 2016 15:47:44 GMT
Merge branch 'cassandra-3.0' into cassandra-3.X


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc78a2af
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc78a2af
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc78a2af

Branch: refs/heads/trunk
Commit: bc78a2afac1bca4cd17ae3e156033ff0b205f3fc
Parents: d582d03 92594d8
Author: Yuki Morishita <yukim@apache.org>
Authored: Tue Nov 8 09:42:54 2016 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Tue Nov 8 09:42:54 2016 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionInfo.java   | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc78a2af/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc78a2af/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index 535217f,3cd8737..344fa58
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@@ -23,8 -23,8 +23,6 @@@ import java.util.Map
  import java.util.UUID;
  
  import org.apache.cassandra.config.CFMetaData;
--import org.apache.cassandra.metrics.StorageMetrics;
--import org.apache.cassandra.service.StorageService;
  
  /** Implements serializable to allow structured info to be returned via JMX. */
  public final class CompactionInfo implements Serializable


Mime
View raw message