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/a2edbede Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2edbede Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2edbede Branch: refs/heads/trunk Commit: a2edbede57e7d335d5d9b56509189449b6d50286 Parents: d34d842 6a60304 Author: Jonathan Ellis <[email protected]> Authored: Sun Oct 6 13:35:30 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Sun Oct 6 13:35:30 2013 -0500 ---------------------------------------------------------------------- .../cassandra/exceptions/PreparedQueryNotFoundException.java | 5 ++--- src/java/org/apache/cassandra/thrift/CassandraServer.java | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2edbede/src/java/org/apache/cassandra/thrift/CassandraServer.java ----------------------------------------------------------------------
