You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/10/26 05:14:38 UTC
[1/6] accumulo git commit: ACCUMULO-4032 Monitor ignores the hostname
supplied in cmdline.
Repository: accumulo
Updated Branches:
refs/heads/1.6 ddace5049 -> b1510fd32
refs/heads/1.7 a1d3c9286 -> dfa734f84
refs/heads/master dfbb3c299 -> 469984c49
ACCUMULO-4032 Monitor ignores the hostname supplied in cmdline.
Monitor should not overwrite the hostname supplied in command line argument `-a` with an autodetected hostname.
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b1510fd3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b1510fd3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b1510fd3
Branch: refs/heads/1.6
Commit: b1510fd326eb4d98fcbcc4c26e97d8f933682694
Parents: ddace50
Author: volth <vo...@webmaster.ms>
Authored: Thu Oct 15 18:16:22 2015 +0000
Committer: Josh Elser <el...@apache.org>
Committed: Mon Oct 26 00:13:46 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/b1510fd3/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 25ee34f..77e2400 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.monitor;
import static com.google.common.base.Charsets.UTF_8;
-import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -480,8 +479,6 @@ public class Monitor {
server.start();
try {
- hostname = InetAddress.getLocalHost().getHostName();
-
log.debug("Using " + hostname + " to advertise monitor location in ZooKeeper");
String monitorAddress = HostAndPort.fromParts(hostname, server.getPort()).toString();
[3/6] accumulo git commit: ACCUMULO-4032 Monitor ignores the hostname
supplied in cmdline.
Posted by el...@apache.org.
ACCUMULO-4032 Monitor ignores the hostname supplied in cmdline.
Monitor should not overwrite the hostname supplied in command line argument `-a` with an autodetected hostname.
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b1510fd3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b1510fd3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b1510fd3
Branch: refs/heads/master
Commit: b1510fd326eb4d98fcbcc4c26e97d8f933682694
Parents: ddace50
Author: volth <vo...@webmaster.ms>
Authored: Thu Oct 15 18:16:22 2015 +0000
Committer: Josh Elser <el...@apache.org>
Committed: Mon Oct 26 00:13:46 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/b1510fd3/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 25ee34f..77e2400 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.monitor;
import static com.google.common.base.Charsets.UTF_8;
-import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -480,8 +479,6 @@ public class Monitor {
server.start();
try {
- hostname = InetAddress.getLocalHost().getHostName();
-
log.debug("Using " + hostname + " to advertise monitor location in ZooKeeper");
String monitorAddress = HostAndPort.fromParts(hostname, server.getPort()).toString();
[5/6] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@apache.org.
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/1.7
Commit: dfa734f842f5466da9eb78848f3cae83b7123153
Parents: a1d3c92 b1510fd
Author: Josh Elser <el...@apache.org>
Authored: Mon Oct 26 00:13:59 2015 -0400
Committer: Josh Elser <el...@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;
[2/6] accumulo git commit: ACCUMULO-4032 Monitor ignores the hostname
supplied in cmdline.
Posted by el...@apache.org.
ACCUMULO-4032 Monitor ignores the hostname supplied in cmdline.
Monitor should not overwrite the hostname supplied in command line argument `-a` with an autodetected hostname.
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b1510fd3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b1510fd3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b1510fd3
Branch: refs/heads/1.7
Commit: b1510fd326eb4d98fcbcc4c26e97d8f933682694
Parents: ddace50
Author: volth <vo...@webmaster.ms>
Authored: Thu Oct 15 18:16:22 2015 +0000
Committer: Josh Elser <el...@apache.org>
Committed: Mon Oct 26 00:13:46 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/b1510fd3/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 25ee34f..77e2400 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.monitor;
import static com.google.common.base.Charsets.UTF_8;
-import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -480,8 +479,6 @@ public class Monitor {
server.start();
try {
- hostname = InetAddress.getLocalHost().getHostName();
-
log.debug("Using " + hostname + " to advertise monitor location in ZooKeeper");
String monitorAddress = HostAndPort.fromParts(hostname, server.getPort()).toString();
[6/6] accumulo git commit: Merge branch '1.7'
Posted by el...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/469984c4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/469984c4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/469984c4
Branch: refs/heads/master
Commit: 469984c4918f82c4c407904f0dd97b35a34c14c1
Parents: dfbb3c2 dfa734f
Author: Josh Elser <el...@apache.org>
Authored: Mon Oct 26 00:14:04 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Oct 26 00:14:04 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/469984c4/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
[4/6] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@apache.org.
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 <el...@apache.org>
Authored: Mon Oct 26 00:13:59 2015 -0400
Committer: Josh Elser <el...@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;