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 C3054200BAC for ; Wed, 12 Oct 2016 05:21:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C1A7F160AE6; Wed, 12 Oct 2016 03:21:10 +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 12C0F160AF3 for ; Wed, 12 Oct 2016 05:21:09 +0200 (CEST) Received: (qmail 53581 invoked by uid 500); 12 Oct 2016 03:21:09 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 53550 invoked by uid 99); 12 Oct 2016 03:21:09 -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; Wed, 12 Oct 2016 03:21:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E68E0E09B3; Wed, 12 Oct 2016 03:21:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Wed, 12 Oct 2016 03:21:11 -0000 Message-Id: <293abbf525dd45779361f6769c771bbd@git.apache.org> In-Reply-To: <7862e0ba8aa3430799a34940f0ee026e@git.apache.org> References: <7862e0ba8aa3430799a34940f0ee026e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Wed, 12 Oct 2016 03:21:10 -0000 Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/98030930 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/98030930 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/98030930 Branch: refs/heads/master Commit: 980309303a305c899df331e23f9c5cc758f8c599 Parents: e6d08dd c58cf64 Author: Josh Elser Authored: Tue Oct 11 23:08:10 2016 -0400 Committer: Josh Elser Committed: Tue Oct 11 23:08:10 2016 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/98030930/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java ----------------------------------------------------------------------