accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/3] git commit: Merge branch '1.6'
Date Wed, 08 Oct 2014 17:29:21 GMT
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 <elserj@apache.org>
Authored: Wed Oct 8 13:28:59 2014 -0400
Committer: Josh Elser <elserj@apache.org>
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);


Mime
View raw message