cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Date Wed, 21 Nov 2012 13:04:39 GMT
Merge branch 'cassandra-1.2.0' into cassandra-1.2


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

Branch: refs/heads/trunk
Commit: a4452eeb168fd081100c633f9d2914c9c8aec48a
Parents: 445c4fa a32eb9f
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Nov 21 14:04:19 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Nov 21 14:04:19 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../cassandra/cql3/statements/SelectStatement.java |   11 ++---
 .../cassandra/db/AbstractColumnContainer.java      |    9 +--
 .../apache/cassandra/db/CollationController.java   |    5 +-
 .../org/apache/cassandra/db/ColumnFamilyStore.java |    8 ++--
 .../org/apache/cassandra/db/RangeSliceCommand.java |   20 ++++----
 src/java/org/apache/cassandra/db/Row.java          |   11 ++--
 .../org/apache/cassandra/db/SliceQueryPager.java   |    5 +-
 .../apache/cassandra/db/filter/ExtendedFilter.java |   38 +++++++-------
 .../cassandra/db/filter/IDiskAtomFilter.java       |   12 +++--
 .../cassandra/db/filter/NamesQueryFilter.java      |   41 ++++++++++++++-
 .../cassandra/db/filter/SliceQueryFilter.java      |   12 ++++-
 .../cassandra/db/index/SecondaryIndexManager.java  |    4 +-
 .../cassandra/db/index/SecondaryIndexSearcher.java |    2 +-
 .../db/index/composites/CompositesSearcher.java    |    8 ++--
 .../cassandra/db/index/keys/KeysSearcher.java      |    4 +-
 .../cassandra/service/RangeSliceVerbHandler.java   |    4 +-
 .../cassandra/service/RowRepairResolver.java       |    6 +-
 .../org/apache/cassandra/service/StorageProxy.java |   24 +++++----
 .../apache/cassandra/db/ColumnFamilyStoreTest.java |    2 +-
 20 files changed, 139 insertions(+), 88 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message