cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk
Date Thu, 03 Sep 2015 19:40:23 GMT
Merge branch cassandra-3.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/1c310a69
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c310a69
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c310a69

Branch: refs/heads/trunk
Commit: 1c310a6981dbbe9dd8b0b6aec0e6cf5d955a265c
Parents: 9068a31 cd5d03d
Author: blerer <benjamin.lerer@datastax.com>
Authored: Thu Sep 3 21:38:41 2015 +0200
Committer: blerer <benjamin.lerer@datastax.com>
Committed: Thu Sep 3 21:39:02 2015 +0200

----------------------------------------------------------------------
 NEWS.txt                                        |  2 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 25 ++-----
 src/java/org/apache/cassandra/db/Keyspace.java  | 17 +++--
 .../cassandra/index/SecondaryIndexManager.java  | 79 +++++++++++++++++++-
 .../index/internal/CassandraIndex.java          |  3 +-
 .../cassandra/service/StorageService.java       | 16 +++-
 .../cassandra/tools/nodetool/RebuildIndex.java  |  2 +-
 .../org/apache/cassandra/cql3/CQLTester.java    |  3 +-
 .../apache/cassandra/db/SecondaryIndexTest.java |  5 +-
 .../index/internal/CassandraIndexTest.java      |  5 +-
 10 files changed, 119 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c310a69/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------


Mime
View raw message