merge from 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/899ec8f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/899ec8f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/899ec8f2 Branch: refs/heads/trunk Commit: 899ec8f253281d71b373a61e30bd5a69bfea47e0 Parents: 5086eef 68032e9 Author: Pavel Yaskevich <xe...@apache.org> Authored: Wed Mar 28 20:18:01 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Wed Mar 28 20:18:01 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/899ec8f2/src/java/org/apache/cassandra/cql/QueryProcessor.java ----------------------------------------------------------------------
