Updated Branches: refs/heads/trunk e194915a8 -> 25b2a4275
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25b2a427 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25b2a427 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25b2a427 Branch: refs/heads/trunk Commit: 25b2a427545de7b7a3808d926886ee1f7ff7275f Parents: e194915 899ec8f Author: Pavel Yaskevich <xe...@apache.org> Authored: Wed Mar 28 20:20:56 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Wed Mar 28 20:20:56 2012 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/cql/QueryProcessor.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25b2a427/src/java/org/apache/cassandra/cql/QueryProcessor.java ----------------------------------------------------------------------