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 BB8D8E73C for ; Fri, 18 Jan 2013 17:48:57 +0000 (UTC) Received: (qmail 70405 invoked by uid 500); 18 Jan 2013 17:48:57 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 70323 invoked by uid 500); 18 Jan 2013 17:48:57 -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 70281 invoked by uid 99); 18 Jan 2013 17:48:57 -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, 18 Jan 2013 17:48:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BD83881F3DA; Fri, 18 Jan 2013 17:48:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2 Message-Id: <20130118174856.BD83881F3DA@tyr.zones.apache.org> Date: Fri, 18 Jan 2013 17:48:56 +0000 (UTC) Merge branch 'cassandra-1.1' 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/4df8fdcd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4df8fdcd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4df8fdcd Branch: refs/heads/trunk Commit: 4df8fdcdeed627885608dd43f397d40f2e1074c3 Parents: e6b6eaa f930eb7 Author: Yuki Morishita Authored: Fri Jan 18 11:47:46 2013 -0600 Committer: Yuki Morishita Committed: Fri Jan 18 11:47:46 2013 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------