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 0075CD533 for ; Fri, 7 Sep 2012 16:06:06 +0000 (UTC) Received: (qmail 96541 invoked by uid 500); 7 Sep 2012 16:06:05 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 96466 invoked by uid 500); 7 Sep 2012 16:06:05 -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 96458 invoked by uid 99); 7 Sep 2012 16:06:05 -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, 07 Sep 2012 16:06:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8AB87281BF; Fri, 7 Sep 2012 16:06:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1 Message-Id: <20120907160605.8AB87281BF@tyr.zones.apache.org> Date: Fri, 7 Sep 2012 16:06:05 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.0 08c654601 -> d3917260b refs/heads/cassandra-1.1 567146e49 -> 06893e4ff Merge branch 'cassandra-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/06893e4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06893e4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/06893e4f Branch: refs/heads/cassandra-1.1 Commit: 06893e4ff4fe81161010e0e948af20b0bb587c4c Parents: 567146e d391726 Author: Brandon Williams Authored: Fri Sep 7 11:05:35 2012 -0500 Committer: Brandon Williams Committed: Fri Sep 7 11:05:35 2012 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------