Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14b98665 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14b98665 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14b98665 Branch: refs/heads/cassandra-2.2 Commit: 14b98665bdb1d4a6074317587d52082e17026506 Parents: 61bea5a f1662b1 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Thu May 28 10:39:37 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Thu May 28 10:39:37 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14b98665/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java ----------------------------------------------------------------------
