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 4F985DBCF for ; Tue, 11 Dec 2012 07:54:35 +0000 (UTC) Received: (qmail 66305 invoked by uid 500); 11 Dec 2012 07:54:34 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 65886 invoked by uid 500); 11 Dec 2012 07:54:33 -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 65719 invoked by uid 99); 11 Dec 2012 07:54:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Dec 2012 07:54:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9393981AECB; Tue, 11 Dec 2012 07:54:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [3/5] git commit: Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0 Message-Id: <20121211075430.9393981AECB@tyr.zones.apache.org> Date: Tue, 11 Dec 2012 07:54:30 +0000 (UTC) Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cbd73a40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cbd73a40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cbd73a40 Branch: refs/heads/cassandra-1.2.0 Commit: cbd73a40a9f940ad063d8d5ca627b2bc20447dc1 Parents: 45ab2d4 35a653c Author: Sylvain Lebresne Authored: Mon Dec 10 20:28:15 2012 +0100 Committer: Sylvain Lebresne Committed: Mon Dec 10 20:28:15 2012 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/Auth.java | 14 +++++++------- .../org/apache/cassandra/cql3/QueryProcessor.java | 12 ++---------- .../cql3/statements/AlterUserStatement.java | 4 ++-- .../cql3/statements/CreateUserStatement.java | 4 ++-- .../cql3/statements/DropUserStatement.java | 4 ++-- 5 files changed, 15 insertions(+), 23 deletions(-) ----------------------------------------------------------------------