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 A9F2AD64F for ; Fri, 4 Jan 2013 16:26:32 +0000 (UTC) Received: (qmail 53554 invoked by uid 500); 4 Jan 2013 16:26:32 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 53535 invoked by uid 500); 4 Jan 2013 16:26:32 -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 53519 invoked by uid 99); 4 Jan 2013 16:26:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2013 16:26:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 411618227D1; Fri, 4 Jan 2013 16:26:32 +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: [2/2] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20130104162632.411618227D1@tyr.zones.apache.org> Date: Fri, 4 Jan 2013 16:26:32 +0000 (UTC) Updated Branches: refs/heads/trunk 8832317ff -> b41fc772e Merge branch 'cassandra-1.2' into trunk Conflicts: pylib/cqlshlib/cql3handling.py Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b41fc772 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b41fc772 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b41fc772 Branch: refs/heads/trunk Commit: b41fc772e1852806ed1f660f00967d4bf0805c84 Parents: 8832317 3411adf Author: Aleksey Yeschenko Authored: Fri Jan 4 19:26:06 2013 +0300 Committer: Aleksey Yeschenko Committed: Fri Jan 4 19:26:06 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b41fc772/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b41fc772/pylib/cqlshlib/cql3handling.py ----------------------------------------------------------------------