Updated Branches: refs/heads/cassandra-1.1 38e145bd2 -> 4fe3bb13e refs/heads/trunk 170146f64 -> caba4ee62
Merge branch 'cassandra-1.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/caba4ee6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/caba4ee6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/caba4ee6 Branch: refs/heads/trunk Commit: caba4ee62b8f68343be23b5711dffe69c3ef613b Parents: 170146f 4fe3bb1 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Mar 6 13:13:11 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Mar 6 13:13:11 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/db/filter/QueryFilter.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/caba4ee6/src/java/org/apache/cassandra/db/filter/QueryFilter.java ----------------------------------------------------------------------
