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/5011437b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5011437b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5011437b Branch: refs/heads/trunk Commit: 5011437b1e8e82a42ea532e454c8df242e12a620 Parents: c54c618 e0718bc Author: Jonathan Ellis <[email protected]> Authored: Fri Mar 14 15:40:09 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Mar 14 15:40:09 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/filter/SliceQueryFilter.java | 20 ++++++++++++++++++-- .../org/apache/cassandra/pig/CqlTableTest.java | 16 ++++++++-------- 3 files changed, 27 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5011437b/CHANGES.txt ----------------------------------------------------------------------
