accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/2] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Fri, 03 Jan 2014 17:46:37 GMT
Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aede331c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aede331c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aede331c

Branch: refs/heads/master
Commit: aede331c282e8d190878b6858e89b12f2f06fd14
Parents: 86a26fe 2654ba5
Author: Josh Elser <elserj@apache.org>
Authored: Fri Jan 3 12:46:26 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Jan 3 12:46:26 2014 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/conf/SiteConfiguration.java | 7 +++++++
 .../apache/accumulo/core/util/shell/ShellSetInstanceTest.java | 6 ++++++
 2 files changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/aede331c/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 ad9597c,4c7d95e..9fcc4fb
--- a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
@@@ -97,9 -79,15 +97,16 @@@ public class SiteConfiguration extends 
    }
  
    /**
 -   * method here to support testing, do not call
 +   * Clears the configuration properties in this configuration (but not the
 +   * parent). This method supports testing and should not be called.
     */
+   synchronized public static void clearInstance() {
+     instance = null;
+   }
+ 
+   /**
+    * method here to support testing, do not call
+    */
    public void clear() {
      getXmlConfig().clear();
    }


Mime
View raw message