cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [46/50] git commit: Merge branch 'cassandra-1.1' into trunk
Date Fri, 24 Feb 2012 15:49:23 GMT
Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/cassandra-1.1
Commit: 59673232dfb90deae30c5a4162b44239e613f656
Parents: 7bc09f9 12d26f8
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Feb 9 17:18:25 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Feb 9 17:18:25 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   34 +++++++++++++--
 src/java/org/apache/cassandra/db/Table.java        |    5 ++
 .../apache/cassandra/db/filter/QueryFilter.java    |    2 +-
 .../apache/cassandra/db/index/SecondaryIndex.java  |   10 ++++
 .../cassandra/db/index/SecondaryIndexManager.java  |   24 ++++++++++-
 .../apache/cassandra/service/StorageService.java   |    5 ++
 .../cassandra/service/StorageServiceMBean.java     |    6 ++-
 src/java/org/apache/cassandra/tools/NodeCmd.java   |   11 +++++
 src/java/org/apache/cassandra/tools/NodeProbe.java |    5 ++
 10 files changed, 96 insertions(+), 7 deletions(-)
----------------------------------------------------------------------



Mime
View raw message