Merge branch 'cassandra-1.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/d371edf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d371edf6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d371edf6 Branch: refs/heads/trunk Commit: d371edf623e06c4c974a0ee2381129d0abcb4e2a Parents: a3f2e9c e2231a1 Author: Jonathan Ellis <[email protected]> Authored: Tue Jan 10 12:54:12 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Tue Jan 10 12:54:12 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql/WhereClause.java | 20 ++++++++++---- 1 files changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d371edf6/src/java/org/apache/cassandra/cql/WhereClause.java ----------------------------------------------------------------------
