cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Date Mon, 23 Sep 2013 18:33:57 GMT
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: eb125ad78b57da38026c1f7775744de53d1676a4
Parents: 74e710a 52b4fc3
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Sep 23 13:33:46 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Sep 23 13:33:46 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 conf/cassandra.yaml                             |  5 ++++
 .../org/apache/cassandra/config/Config.java     |  2 ++
 .../cassandra/config/DatabaseDescriptor.java    | 14 +++++++++
 .../apache/cassandra/db/ColumnFamilyStore.java  | 31 ++++++++++++++++----
 .../cassandra/db/ColumnFamilyStoreMBean.java    |  9 ++++++
 .../cassandra/db/filter/SliceQueryFilter.java   | 20 +++++++++----
 .../cassandra/metrics/ColumnFamilyMetrics.java  |  8 +++++
 .../cassandra/service/StorageService.java       | 10 +++++++
 .../cassandra/service/StorageServiceMBean.java  |  5 ++++
 10 files changed, 93 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb125ad7/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb125ad7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 36fe7f9,ec9570a..6d27625
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -69,9 -66,9 +66,8 @@@ import org.apache.cassandra.io.util.Fil
  import org.apache.cassandra.metrics.ColumnFamilyMetrics;
  import org.apache.cassandra.service.CacheService;
  import org.apache.cassandra.service.StorageService;
 -import org.apache.cassandra.thrift.IndexExpression;
  import org.apache.cassandra.tracing.Tracing;
  import org.apache.cassandra.utils.*;
- import org.cliffc.high_scale_lib.NonBlockingHashMap;
  
  import static org.apache.cassandra.config.CFMetaData.Caching;
  

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb125ad7/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------


Mime
View raw message