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 9E392100D4 for ; Thu, 17 Oct 2013 21:12:21 +0000 (UTC) Received: (qmail 60253 invoked by uid 500); 17 Oct 2013 21:11:02 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 59931 invoked by uid 500); 17 Oct 2013 21:10:49 -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 59755 invoked by uid 99); 17 Oct 2013 21:10:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Oct 2013 21:10:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 26C159177D9; Thu, 17 Oct 2013 21:10:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jasobrown@apache.org To: commits@cassandra.apache.org Date: Thu, 17 Oct 2013 21:10:49 -0000 Message-Id: In-Reply-To: <4a8eb5c2067f452bb8f7430566db79cf@git.apache.org> References: <4a8eb5c2067f452bb8f7430566db79cf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0 Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0590c44 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0590c44 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0590c44 Branch: refs/heads/trunk Commit: b0590c4480dbb5bb05c0ad28e223d20a0d9c9f09 Parents: 886f16c 5c0c84b Author: Jason Brown Authored: Thu Oct 17 14:00:33 2013 -0700 Committer: Jason Brown Committed: Thu Oct 17 14:00:33 2013 -0700 ---------------------------------------------------------------------- ----------------------------------------------------------------------