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 932E597B5 for ; Mon, 2 Apr 2012 21:40:05 +0000 (UTC) Received: (qmail 32708 invoked by uid 500); 2 Apr 2012 21:40:04 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 32608 invoked by uid 500); 2 Apr 2012 21:40:04 -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 32454 invoked by uid 99); 2 Apr 2012 21:40:04 -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, 02 Apr 2012 21:40:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4BFD5A8FB; Mon, 2 Apr 2012 21:40:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/12] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1 Message-Id: <20120402214004.4BFD5A8FB@tyr.zones.apache.org> Date: Mon, 2 Apr 2012 21:40:04 +0000 (UTC) Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5882ad39 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5882ad39 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5882ad39 Branch: refs/heads/cassandra-1.1 Commit: 5882ad3902176090f8cb1cd3cc5ff6e5610c956f Parents: 68dc7d0 b3b6e4a Author: Jonathan Ellis Authored: Mon Apr 2 16:39:01 2012 -0500 Committer: Jonathan Ellis Committed: Mon Apr 2 16:39:01 2012 -0500 ---------------------------------------------------------------------- interface/cassandra.thrift | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) ----------------------------------------------------------------------