Merge branch 'cassandra-2.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/21c7252d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21c7252d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21c7252d Branch: refs/heads/trunk Commit: 21c7252d6e9c2c3ed8918ac32867b32fe980d911 Parents: db6b563 947e10f Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Mar 4 11:53:23 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Mar 4 11:53:23 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 ++ .../cql3/statements/UpdateStatement.java | 12 +++--- .../org/apache/cassandra/db/SuperColumns.java | 5 +++ .../db/columniterator/IndexedSliceReader.java | 45 +++++++++++++++++--- .../db/columniterator/SSTableNamesIterator.java | 6 ++- 5 files changed, 59 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21c7252d/CHANGES.txt ----------------------------------------------------------------------
