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 F1696E141 for ; Mon, 17 Dec 2012 15:42:48 +0000 (UTC) Received: (qmail 31844 invoked by uid 500); 17 Dec 2012 15:42:38 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 31062 invoked by uid 500); 17 Dec 2012 15:42:36 -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 29128 invoked by uid 99); 17 Dec 2012 15:41:15 -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, 17 Dec 2012 15:41:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D739281DC5B; Mon, 17 Dec 2012 15:41:14 +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.0' into cassandra-1.2 Message-Id: <20121217154114.D739281DC5B@tyr.zones.apache.org> Date: Mon, 17 Dec 2012 15:41:14 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.2 10959ef3a -> f7f01007b Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f7f01007 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7f01007 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7f01007 Branch: refs/heads/cassandra-1.2 Commit: f7f01007bcfe06763845241e432ec8d72955fd40 Parents: 10959ef 63902c6 Author: Aleksey Yeschenko Authored: Mon Dec 17 18:40:48 2012 +0300 Committer: Aleksey Yeschenko Committed: Mon Dec 17 18:40:48 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ bin/cqlsh | 12 +++++++++--- .../apache/cassandra/auth/SimpleAuthorizer.java | 10 +++++----- pylib/cqlshlib/tracing.py | 6 ++++-- 4 files changed, 20 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7f01007/CHANGES.txt ----------------------------------------------------------------------