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 6977510E80 for ; Tue, 25 Feb 2014 19:58:39 +0000 (UTC) Received: (qmail 67979 invoked by uid 500); 25 Feb 2014 19:58:35 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 67926 invoked by uid 500); 25 Feb 2014 19:58:34 -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 67909 invoked by uid 99); 25 Feb 2014 19:58:34 -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, 25 Feb 2014 19:58:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 07B3792CB3E; Tue, 25 Feb 2014 19:58:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mishail@apache.org To: commits@cassandra.apache.org Date: Tue, 25 Feb 2014 19:58:34 -0000 Message-Id: <09016b4d65e64037b0b9a14debe4cec5@git.apache.org> In-Reply-To: <7bbbb182c3c1417e87e3e0b057a1dd6e@git.apache.org> References: <7bbbb182c3c1417e87e3e0b057a1dd6e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d598726 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d598726 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d598726 Branch: refs/heads/trunk Commit: 1d598726f49e69786b994c94c71b7065b90455b3 Parents: f48adab d4d4334 Author: Mikhail Stepura Authored: Tue Feb 25 11:58:22 2014 -0800 Committer: Mikhail Stepura Committed: Tue Feb 25 11:58:22 2014 -0800 ---------------------------------------------------------------------- pylib/cqlshlib/usertypes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------