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 655B717FE8 for ; Wed, 8 Oct 2014 17:29:20 +0000 (UTC) Received: (qmail 20456 invoked by uid 500); 8 Oct 2014 17:29:20 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 20357 invoked by uid 500); 8 Oct 2014 17:29:20 -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 20330 invoked by uid 99); 8 Oct 2014 17:29:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Oct 2014 17:29:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0E4EF92C394; Wed, 8 Oct 2014 17:29:20 +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, 08 Oct 2014 17:29:21 -0000 Message-Id: <3278c2a4f28244569172045749562d41@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.6' Merge branch '1.6' Conflicts: core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e30594a6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e30594a6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e30594a6 Branch: refs/heads/master Commit: e30594a65ceb43dd9f4a3c69b087301a28342816 Parents: f6b83ee 9b3bc30 Author: Josh Elser Authored: Wed Oct 8 13:28:59 2014 -0400 Committer: Josh Elser Committed: Wed Oct 8 13:28:59 2014 -0400 ---------------------------------------------------------------------- .../tokens/CredentialProviderToken.java | 4 ++-- .../conf/CredentialProviderFactoryShim.java | 2 +- .../accumulo/core/conf/SiteConfiguration.java | 24 ++++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e30594a6/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java index 55f69bd,9b65e7d..2d121c7 --- a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java @@@ -173,12 -153,10 +173,12 @@@ public class SiteConfiguration extends public void clear() { getXmlConfig().clear(); } - - + + /** - * method here to support testing, do not call + * Clears the configuration properties in this configuration (but not the + * parent) and nulls it. This method supports testing and should not be + * called. */ public synchronized void clearAndNull() { if (xmlConfig != null) { @@@ -186,22 -164,16 +186,22 @@@ xmlConfig = null; } } - + /** - * method here to support testing, do not call + * Sets a property. This method supports testing and should not be called. + * + * @param property property to set + * @param value property value */ public void set(Property property, String value) { set(property.getKey(), value); } - + /** - * method here to support testing, do not call + * Sets a property. This method supports testing and should not be called. + * + * @param key key of property to set + * @param value property value */ public void set(String key, String value) { getXmlConfig().set(key, value);