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 AE039D8EA for ; Mon, 10 Dec 2012 19:01:45 +0000 (UTC) Received: (qmail 64579 invoked by uid 500); 10 Dec 2012 19:01:45 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 64532 invoked by uid 500); 10 Dec 2012 19:01:45 -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 64524 invoked by uid 99); 10 Dec 2012 19:01:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Dec 2012 19:01:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2E54A81A8B3; Mon, 10 Dec 2012 19:01:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20121210190145.2E54A81A8B3@tyr.zones.apache.org> Date: Mon, 10 Dec 2012 19:01:45 +0000 (UTC) Updated Branches: refs/heads/trunk 7cb254125 -> 8b08dd17f Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b08dd17 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b08dd17 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b08dd17 Branch: refs/heads/trunk Commit: 8b08dd17f4574ee0e22bf61864aa130e705bf4a4 Parents: 7cb2541 8752bfa Author: Aleksey Yeschenko Authored: Mon Dec 10 22:01:27 2012 +0300 Committer: Aleksey Yeschenko Committed: Mon Dec 10 22:01:27 2012 +0300 ---------------------------------------------------------------------- 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(-) ----------------------------------------------------------------------