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 1836119CEE for ; Tue, 26 Apr 2016 16:30:17 +0000 (UTC) Received: (qmail 84736 invoked by uid 500); 26 Apr 2016 16:30:13 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 84672 invoked by uid 500); 26 Apr 2016 16:30:13 -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 84219 invoked by uid 99); 26 Apr 2016 16:30:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Apr 2016 16:30:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9A2B1E9819; Tue, 26 Apr 2016 16:30:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Date: Tue, 26 Apr 2016 16:30:25 -0000 Message-Id: <7baa17b4d4da461a8e456e6c31fe702b@git.apache.org> In-Reply-To: <89fb43b0e0ee4c5b9fa1d4340b840cc0@git.apache.org> References: <89fb43b0e0ee4c5b9fa1d4340b840cc0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/18] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aea8e082 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aea8e082 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aea8e082 Branch: refs/heads/trunk Commit: aea8e082f96fd41385b29ea9dd975576a6357a3e Parents: 049d70c ec1772a Author: T Jake Luciani Authored: Tue Apr 26 12:28:23 2016 -0400 Committer: T Jake Luciani Committed: Tue Apr 26 12:28:23 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------