Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 914E910B92 for ; Sun, 6 Oct 2013 18:35:46 +0000 (UTC) Received: (qmail 49199 invoked by uid 500); 6 Oct 2013 18:35:40 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 49133 invoked by uid 500); 6 Oct 2013 18:35:38 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 49010 invoked by uid 99); 6 Oct 2013 18:35:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Oct 2013 18:35:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E0F23910D4A; Sun, 6 Oct 2013 18:35:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Sun, 06 Oct 2013 18:35:40 -0000 Message-Id: In-Reply-To: <4ce004fcf3834097a510a3fa456701a5@git.apache.org> References: <4ce004fcf3834097a510a3fa456701a5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: Merge branch 'cassandra-2.0' into trunk 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 Authored: Sun Oct 6 13:35:30 2013 -0500 Committer: Jonathan Ellis 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 ----------------------------------------------------------------------