Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 13187200B70 for ; Fri, 12 Aug 2016 15:42:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 11F41160A85; Fri, 12 Aug 2016 13:42:26 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7EFEA160AB6 for ; Fri, 12 Aug 2016 15:42:25 +0200 (CEST) Received: (qmail 51244 invoked by uid 500); 12 Aug 2016 13:42:24 -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 50964 invoked by uid 99); 12 Aug 2016 13:42:24 -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; Fri, 12 Aug 2016 13:42:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4F32EE3889; Fri, 12 Aug 2016 13:42:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blerer@apache.org To: commits@cassandra.apache.org Date: Fri, 12 Aug 2016 13:42:26 -0000 Message-Id: <7fa32b6a914c4a318e1021a980c9f8e5@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.9 archived-at: Fri, 12 Aug 2016 13:42:26 -0000 Merge branch cassandra-3.0 into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c771a2d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c771a2d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c771a2d Branch: refs/heads/cassandra-3.9 Commit: 0c771a2db1d94901b4c7b194b9b71a115a1dc828 Parents: f4c3e14 c85749e Author: Benjamin Lerer Authored: Fri Aug 12 15:40:10 2016 +0200 Committer: Benjamin Lerer Committed: Fri Aug 12 15:40:55 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StorageProxy.java | 49 +++++++++++++------- 2 files changed, 34 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c771a2d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c771a2d/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------