cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Wed, 16 Jul 2014 22:21:32 GMT
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 57ec7b7352afcd541b7b058ac5500c7682243157
Parents: 367a369 2a66119
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Wed Jul 16 17:20:24 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Wed Jul 16 17:20:24 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../db/composites/BoundedComposite.java         |  3 ++
 .../cassandra/db/filter/ExtendedFilter.java     | 22 +++++++++---
 .../db/index/SecondaryIndexManager.java         | 34 +++++++++---------
 .../db/index/SecondaryIndexSearcher.java        | 15 ++++++--
 .../CompositesIndexOnCollectionValue.java       |  9 ++++-
 .../apache/cassandra/service/StorageProxy.java  | 17 +++++----
 .../cassandra/cql3/ContainsRelationTest.java    | 38 ++++++++++++++++++++
 8 files changed, 108 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/57ec7b73/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------


Mime
View raw message