Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7dd9ea2e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dd9ea2e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7dd9ea2e Branch: refs/heads/trunk Commit: 7dd9ea2e864127448857dfdf9cca021a86f9072f Parents: 8bdba79 546cbf5 Author: Jonathan Ellis <[email protected]> Authored: Wed Oct 2 11:01:49 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Oct 2 11:01:49 2013 -0500 ---------------------------------------------------------------------- .../cassandra/db/columniterator/IdentityQueryFilter.java | 2 +- src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
