accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [4/6] accumulo git commit: Merge branch '1.6' into 1.7
Date Mon, 26 Oct 2015 04:14:41 GMT
Merge branch '1.6' into 1.7


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

Branch: refs/heads/master
Commit: dfa734f842f5466da9eb78848f3cae83b7123153
Parents: a1d3c92 b1510fd
Author: Josh Elser <elserj@apache.org>
Authored: Mon Oct 26 00:13:59 2015 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Oct 26 00:13:59 2015 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/accumulo/monitor/Monitor.java        | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/dfa734f8/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 9e01abe,77e2400..24e2e3f
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@@ -16,9 -16,8 +16,8 @@@
   */
  package org.apache.accumulo.monitor;
  
 -import static com.google.common.base.Charsets.UTF_8;
 +import static java.nio.charset.StandardCharsets.UTF_8;
  
- import java.net.InetAddress;
  import java.util.ArrayList;
  import java.util.Collections;
  import java.util.HashMap;


Mime
View raw message