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/57273124 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57273124 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57273124 Branch: refs/heads/trunk Commit: 5727312470de51926b125585d2fa453b87c38a45 Parents: 5011437 47675ce Author: Jonathan Ellis <[email protected]> Authored: Fri Mar 14 15:42:06 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Mar 14 15:42:06 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
