accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlmar...@apache.org
Subject [3/3] accumulo git commit: Merge branch '1.7' into 1.8
Date Tue, 14 Jun 2016 13:22:53 GMT
Merge branch '1.7' into 1.8


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

Branch: refs/heads/1.8
Commit: 24289e2c4c32850185b8649a5022b495c3205a83
Parents: a98dbec 1ca7e2e
Author: Dave Marion <dlmarion@apache.org>
Authored: Tue Jun 14 09:21:33 2016 -0400
Committer: Dave Marion <dlmarion@apache.org>
Committed: Tue Jun 14 09:21:33 2016 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/start/Main.java    | 35 +++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/24289e2c/start/src/main/java/org/apache/accumulo/start/Main.java
----------------------------------------------------------------------
diff --cc start/src/main/java/org/apache/accumulo/start/Main.java
index 99e1d5c,90eb5f4..414394a
--- a/start/src/main/java/org/apache/accumulo/start/Main.java
+++ b/start/src/main/java/org/apache/accumulo/start/Main.java
@@@ -183,7 -210,7 +210,7 @@@ public class Main 
      System.out.println("accumulo " + kwString + " | <accumulo class> args");
    }
  
-   public static Map<String,KeywordExecutable> getExecutables(final ClassLoader cl)
{
 -  static synchronized Map<String,KeywordExecutable> getExecutables(final ClassLoader
cl) {
++  public static synchronized Map<String,KeywordExecutable> getExecutables(final ClassLoader
cl) {
      if (servicesMap == null) {
        servicesMap = checkDuplicates(ServiceLoader.load(KeywordExecutable.class, cl));
      }


Mime
View raw message