accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/4] git commit: ACCUMULO-3052 Use a StringUtils method that isn't hadoop version dependent.
Date Thu, 07 Aug 2014 21:10:40 GMT
ACCUMULO-3052 Use a StringUtils method that isn't hadoop version dependent.


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

Branch: refs/heads/master
Commit: 290866f256177488576544ff7bfc20fb618d1ca4
Parents: 1b459a0
Author: Josh Elser <elserj@apache.org>
Authored: Thu Aug 7 17:02:33 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Aug 7 17:07:48 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/util/SslConnectionParams.java    | 2 +-
 .../main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/290866f2/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java b/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java
index 652f768..dad6792 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java
@@ -22,7 +22,7 @@ import java.net.URL;
 
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
-import org.apache.hadoop.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.thrift.transport.TSSLTransportFactory.TSSLTransportParameters;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/290866f2/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
index 888913a..82cd436 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServlet;
 
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
-import org.apache.hadoop.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.server.session.SessionHandler;


Mime
View raw message