Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 647BD176E6 for ; Mon, 20 Oct 2014 22:03:27 +0000 (UTC) Received: (qmail 70336 invoked by uid 500); 20 Oct 2014 22:03:27 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 70287 invoked by uid 500); 20 Oct 2014 22:03:27 -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 70231 invoked by uid 99); 20 Oct 2014 22:03:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Oct 2014 22:03:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D37949D3931; Mon, 20 Oct 2014 22:03:26 +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: Mon, 20 Oct 2014 22:03:32 -0000 Message-Id: <7796156e4f1e450497406e78bc064bed@git.apache.org> In-Reply-To: <9f59f8c59be042e8bc74c68cbbc2ba7d@git.apache.org> References: <9f59f8c59be042e8bc74c68cbbc2ba7d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/7] git commit: Merge branch '1.6' Merge branch '1.6' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3353a459 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3353a459 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3353a459 Branch: refs/heads/master Commit: 3353a45962903e004ede11b4aa7ba284e00a0b83 Parents: 8bea7ab 5f29c9f Author: Josh Elser Authored: Mon Oct 20 17:43:43 2014 -0400 Committer: Josh Elser Committed: Mon Oct 20 17:43:43 2014 -0400 ---------------------------------------------------------------------- core/pom.xml | 5 ++ .../tokens/CredentialProviderToken.java | 3 +- .../conf/CredentialProviderFactoryShim.java | 16 +++- .../accumulo/core/conf/SiteConfiguration.java | 3 +- .../conf/CredentialProviderFactoryShimTest.java | 91 +++++++++++++------- .../accumulo/fate/zookeeper/ZooCache.java | 2 +- .../apache/accumulo/fate/zookeeper/ZooUtil.java | 70 +++++++++++++-- .../zookeeper/ZooKeeperConnectionInfoTest.java | 31 +++++++ .../accumulo/test/KeyValueEqualityTest.java | 31 ++----- 9 files changed, 185 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3353a459/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3353a459/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3353a459/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java ----------------------------------------------------------------------