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/24e1bc76 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24e1bc76 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/24e1bc76 Branch: refs/heads/trunk Commit: 24e1bc76824a90b1417d58164f5e4dcd3f90c687 Parents: 7773841 b407ebc Author: Tyler Hobbs <[email protected]> Authored: Thu Jul 31 17:33:24 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Thu Jul 31 17:33:24 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/filter/ColumnSlice.java | 21 ++++++- .../cassandra/db/filter/SliceQueryFilter.java | 1 - .../cassandra/db/filter/ColumnSliceTest.java | 66 ++++++++++++++++++++ 4 files changed, 85 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/24e1bc76/CHANGES.txt ----------------------------------------------------------------------
