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 C785E200BBE for ; Fri, 11 Nov 2016 20:15:21 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C6298160B01; Fri, 11 Nov 2016 19:15:21 +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 1DC32160AEE for ; Fri, 11 Nov 2016 20:15:20 +0100 (CET) Received: (qmail 91572 invoked by uid 500); 11 Nov 2016 19:15:20 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 91559 invoked by uid 99); 11 Nov 2016 19:15:20 -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, 11 Nov 2016 19:15:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 10C6CE38B1; Fri, 11 Nov 2016 19:15:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Date: Fri, 11 Nov 2016 19:15:21 -0000 Message-Id: <2c8d9bf68bf04168848d5dff3a5c5647@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] fabric commit: updated refs/heads/master to 67978b1 archived-at: Fri, 11 Nov 2016 19:15:21 -0000 Merge branch 'COUCHDB-3234-open-shard-timeout-counter' Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/67978b14 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/67978b14 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/67978b14 Branch: refs/heads/master Commit: 67978b140acc4a3afdb3679b47e989c5b0caf194 Parents: 7cfabb5 4fcfecf Author: Paul J. Davis Authored: Fri Nov 11 13:15:09 2016 -0600 Committer: Paul J. Davis Committed: Fri Nov 11 13:15:09 2016 -0600 ---------------------------------------------------------------------- priv/stats_descriptions.cfg | 4 ++++ src/fabric_rpc.erl | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) ----------------------------------------------------------------------