From commits-return-21410-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Fri Jan 26 02:00:37 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 9BE6C180651 for ; Fri, 26 Jan 2018 02:00:37 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8C743160C50; Fri, 26 Jan 2018 01:00:37 +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 05E3D160C4F for ; Fri, 26 Jan 2018 02:00:36 +0100 (CET) Received: (qmail 28105 invoked by uid 500); 26 Jan 2018 01:00:36 -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 28083 invoked by uid 99); 26 Jan 2018 01:00:36 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Jan 2018 01:00:36 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8484181F9F; Fri, 26 Jan 2018 01:00:35 +0000 (UTC) Date: Fri, 26 Jan 2018 01:00:36 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] 01/01: Merge branch '1.7' into 1.8 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: kturner@apache.org In-Reply-To: <151692843540.10621.11446120870896608717@gitbox.apache.org> References: <151692843540.10621.11446120870896608717@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/1.8 X-Git-Reftype: branch X-Git-Rev: 40f6672cbb3e4bbb98c50f8b794ce232a602e2f1 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180126010035.8484181F9F@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch 1.8 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 40f6672cbb3e4bbb98c50f8b794ce232a602e2f1 Merge: d46dd16 7bc630c Author: Keith Turner AuthorDate: Thu Jan 25 19:44:56 2018 -0500 Merge branch '1.7' into 1.8 .../accumulo/core/client/impl/ClientContext.java | 6 ++ .../core/client/mock/MockConfiguration.java | 5 ++ .../accumulo/core/conf/AccumuloConfiguration.java | 27 ++++++ .../accumulo/core/conf/ConfigurationCopy.java | 5 ++ .../accumulo/core/conf/DefaultConfiguration.java | 5 ++ .../accumulo/core/conf/SiteConfiguration.java | 9 ++ .../apache/accumulo/fate/zookeeper/ZooCache.java | 97 ++++++++++++++++------ .../accumulo/server/conf/ZooConfiguration.java | 15 +++- .../java/org/apache/accumulo/master/Master.java | 4 +- .../org/apache/accumulo/tserver/TabletServer.java | 4 +- .../main/java/org/apache/accumulo/shell/Shell.java | 4 +- .../start/classloader/vfs/ContextManager.java | 11 +-- 12 files changed, 153 insertions(+), 39 deletions(-) -- To stop receiving notification emails like this one, please contact kturner@apache.org.