Merge branch 'master' into dybis/update-author

45 files changed, 52 insertions, 51 deletions

diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt
index ce72c16b493..fcc011790b9 100644
--- a/configserver/CMakeLists.txt
+++ b/configserver/CMakeLists.txt
@@ -1,7 +1,9 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_install_script(src/main/sh/cloudconfig_server-remove-state bin)
-vespa_install_script(src/main/sh/start-filedistribution start-file libexec)
-vespa_install_script(src/main/sh/ping-configserver libexec)
-vespa_install_script(src/main/sh/start-configserver libexec)
-vespa_install_script(src/main/sh/start-logd libexec)
-vespa_install_script(src/main/sh/stop-configserver libexec)
+vespa_install_script(src/main/sh/start-filedistribution libexec/vespa)
+vespa_install_script(src/main/sh/ping-configserver libexec/vespa)
+vespa_install_script(src/main/sh/start-configserver libexec/vespa)
+vespa_install_script(src/main/sh/start-logd libexec/vespa)
+vespa_install_script(src/main/sh/stop-configserver libexec/vespa)
+install(DIRECTORY src/main/resources/logd DESTINATION conf)
+install(DIRECTORY src/main/resources/configserver-app DESTINATION conf)
diff --git a/configserver/OWNERS b/configserver/OWNERS
index e0a00db5f4f..338ed581212 100644
--- a/configserver/OWNERS
+++ b/configserver/OWNERS
@@ -1 +1 @@
-musum
+hmusum
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/DelayedConfigResponses.java b/configserver/src/main/java/com/yahoo/vespa/config/server/DelayedConfigResponses.java
index 1c6f75b62f0..204ab214199 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/DelayedConfigResponses.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/DelayedConfigResponses.java
@@ -19,7 +19,7 @@ import java.util.logging.Logger;
  * A delayed response is a response sent at request (server) timeout
  * for a config which has not changed since the request was initiated.
  *
- * @author musum
+ * @author hmusum
  */
 public class DelayedConfigResponses {
     private static final Logger log = Logger.getLogger(DelayedConfigResponses.class.getName());
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigProcessor.java b/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigProcessor.java
index eb5fedf9a40..58020dd773c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigProcessor.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigProcessor.java
@@ -19,7 +19,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
-* @author musum
+* @author hmusum
 * @since 5.1
 */
 class GetConfigProcessor implements Runnable {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/HostRegistries.java b/configserver/src/main/java/com/yahoo/vespa/config/server/HostRegistries.java
index dc411626b39..117f807c309 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/HostRegistries.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/HostRegistries.java
@@ -9,7 +9,7 @@ import java.util.HashMap;
 /**
  * Component to hold host registries.
  *
- * @author musum
+ * @author hmusum
  */
 public class HostRegistries {
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/RotationsCache.java b/configserver/src/main/java/com/yahoo/vespa/config/server/RotationsCache.java
index 2a686e2dee3..b1a2988109d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/RotationsCache.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/RotationsCache.java
@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
 /**
  * Rotations for an application. Persisted in ZooKeeper.
  *
- * @author musum
+ * @author hmusum
  */
 public class RotationsCache {
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/RpcServer.java
index f49268dd800..53c54045bf6 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/RpcServer.java
@@ -47,7 +47,7 @@ import java.util.logging.Logger;
  * An RPC server class that handles the config protocol RPC method "getConfigV3".
  * Mandatory hooks need to be implemented by subclasses.
  *
- * @author <a href="musum@yahoo-inc.com">Harald Musum</a>
+ * @author hmusum
  */
 public class RpcServer implements Runnable, ReloadListener, TenantListener {
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
index 9c6f21f3511..f055887c77a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
@@ -24,7 +24,7 @@ import java.util.*;
 /**
  * A class used for reading and writing application data to zookeeper.
  *
- * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a>
+ * @author hmusum
  * @since 5.1
  */
 public class ZooKeeperClient {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/BadRequestException.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/BadRequestException.java
index 2af55c343a1..976ff661ed2 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/BadRequestException.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/BadRequestException.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.config.server.http;
 /**
  * Exception that will create a http response with BAD_REQUEST response code (400)
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.17
  */
 public class BadRequestException extends RuntimeException {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java
index c2d255e1630..75788495fdf 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java
@@ -15,7 +15,7 @@ import java.util.List;
  * Requests for content and content status, both for prepared and active sessions,
  * are handled by this class.
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.15
  */
 public class ContentHandler {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java
index 7eb6f9c2271..5f01b1e1f49 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java
@@ -18,7 +18,7 @@ import java.util.concurrent.Executor;
  * methods for a request. Handlers should subclass this method and
  * implement the handleMETHOD methods that it supports.
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.14
  */
 public class HttpHandler extends LoggingRequestHandler {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/InternalServerException.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/InternalServerException.java
index 240f5814652..6680e686d7e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/InternalServerException.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/InternalServerException.java
@@ -6,7 +6,7 @@ import java.io.IOException;
 /**
  * Exception that will create a http response with INTERNAL_SERVER_ERROR response code (500)
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.17
  */
 public class InternalServerException extends RuntimeException {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/InvalidApplicationException.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/InvalidApplicationException.java
index ba8f034777a..9fec1b0af99 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/InvalidApplicationException.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/InvalidApplicationException.java
@@ -2,7 +2,7 @@
 package com.yahoo.vespa.config.server.http;
 
 /**
- * @author musum
+ * @author hmusum
  */
 public class InvalidApplicationException extends RuntimeException {
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/NotFoundException.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/NotFoundException.java
index 327e792134a..6a49188a14c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/NotFoundException.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/NotFoundException.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.config.server.http;
 /**
  * Exception that will create a http response with NOT_FOUND response code (404)
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.17
  */
 public class NotFoundException extends RuntimeException {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusListResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusListResponse.java
index caf38517b6a..2ef99372fba 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusListResponse.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusListResponse.java
@@ -14,7 +14,7 @@ import java.util.*;
 /**
  * Status and md5sum for files within an application package.
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.15
  */
 class SessionContentStatusListResponse extends SessionResponse {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusResponse.java
index 15c852b66c3..f8e3f4c10f1 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusResponse.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusResponse.java
@@ -9,7 +9,7 @@ import java.io.*;
 /**
  * Represents a response for a request to show the status and md5sum of a file in the application package.
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.15
  */
 public class SessionContentStatusResponse extends SessionResponse {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreate.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreate.java
index 1526a5b4e0e..fdafd5a7b16 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreate.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreate.java
@@ -25,7 +25,7 @@ import java.io.IOException;
  * Handles /application/v2 requests
  *
  * @author lulf
- * @author musum
+ * @author hmusum
  * @since 5.1.27
  */
 // TODO Rename class
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreateResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreateResponse.java
index 72810ed394c..c3fc33bcbd6 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreateResponse.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionCreateResponse.java
@@ -6,7 +6,7 @@ import com.yahoo.container.jdisc.HttpResponse;
 /**
  * Interface for creating responses for SessionCreateHandler.
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.27
  */
 public interface SessionCreateResponse {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java
index c8829cf9e4d..db1cb7dc202 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java
@@ -21,7 +21,7 @@ import java.util.concurrent.Executor;
  * methods for a request. Session handlers should subclass this method and
  * implement the handleMETHOD methods that it supports.
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.14
  */
 public class SessionHandler extends HttpHandler {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionResponse.java
index 5054e1129d1..4c636fb91ec 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionResponse.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionResponse.java
@@ -15,7 +15,7 @@ import static com.yahoo.jdisc.http.HttpResponse.Status.OK;
  * Superclass for responses from session HTTP handlers.  Implements the
  * render method.
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.14
  */
 public class SessionResponse extends HttpResponse {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/UnknownVespaVersionException.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/UnknownVespaVersionException.java
index bfdbdd1d4b1..d320b1bfbbd 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/UnknownVespaVersionException.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/UnknownVespaVersionException.java
@@ -2,7 +2,7 @@
 package com.yahoo.vespa.config.server.http;
 
 /**
- * @author musum
+ * @author hmusum
  * @since 5.39
  */
 public class UnknownVespaVersionException extends RuntimeException {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/Utils.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/Utils.java
index 83f4c836d20..e1159ba8e64 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/Utils.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/Utils.java
@@ -13,7 +13,7 @@ import java.net.URI;
 /**
  * Utilities for handlers.
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.14
  */
 public class Utils {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
index 458a3899d4c..6f96e9c136d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
@@ -33,7 +33,7 @@ import java.util.concurrent.Executor;
 /**
  * Handler for deleting a currently active application for a tenant.
  *
- * @author musum
+ * @author hmusum
  * @since 5.4
  */
 public class ApplicationHandler extends HttpHandler {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/HostHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/HostHandler.java
index 086954c384f..03c0c7d7fc9 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/HostHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/HostHandler.java
@@ -21,7 +21,7 @@ import java.util.concurrent.Executor;
 /**
  * Handler for getting tenant and application for a given hostname.
  *
- * @author musum
+ * @author hmusum
  * @since 5.19
  */
 public class HostHandler extends HttpHandler {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentRequestV2.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentRequestV2.java
index 16d3fd6802a..1bdd37dd685 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentRequestV2.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentRequestV2.java
@@ -12,7 +12,7 @@ import com.yahoo.vespa.config.server.session.LocalSession;
  * Requests for content and content status (v2)
  * are handled by this class.
  *
- * @author musum
+ * @author hmusum
  * @since 5.3
  */
 class SessionContentRequestV2 extends ContentRequest {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
index 90d8ba63892..c4f4a5139b5 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
@@ -32,7 +32,7 @@ import java.util.logging.Logger;
  * or create a new session from a previous session (with id or the "active" session).
  * Handles /application/v2/ requests
  *
- * @author musum
+ * @author hmusum
  * @since 5.1
  */
 public class SessionCreateHandler extends SessionHandler {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateResponseV2.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateResponseV2.java
index 5fab4b97407..30c7e98e2da 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateResponseV2.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateResponseV2.java
@@ -11,7 +11,7 @@ import com.yahoo.vespa.config.server.http.SessionResponse;
 /**
  * Creates a response for SessionCreateHandler (v2).
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.27
  */
 public class SessionCreateResponseV2 extends SessionResponse implements SessionCreateResponse {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java
index 9a0cc7e6d16..cf2094933c1 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java
@@ -31,7 +31,7 @@ import java.util.logging.Logger;
 /**
  * A handler that prepares a session given by an id in the request. v2 of application API
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.29
  */
 public class SessionPrepareHandler extends SessionHandler {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareResponse.java
index dbc36bbc948..c46d0e063b3 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareResponse.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareResponse.java
@@ -12,7 +12,7 @@ import com.yahoo.vespa.config.server.session.Session;
 /**
  * Creates a response for SessionPrepareHandler.
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.28
  */
 class SessionPrepareResponse extends SessionResponse {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantGetResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantGetResponse.java
index 99393cd351a..bdaee44024d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantGetResponse.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantGetResponse.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.config.server.http.SessionResponse;
 /**
  * Response for tenant create
  *
- * @author musum
+ * @author hmusum
  */
 public class TenantGetResponse extends SessionResponse {
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/MetricUpdater.java b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/MetricUpdater.java
index 8eae14b9aac..da6616772d3 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/MetricUpdater.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/MetricUpdater.java
@@ -10,7 +10,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import static com.yahoo.vespa.config.server.monitoring.Metrics.getMetricName;
 /**
- * @author musum
+ * @author hmusum
  */
 // TODO javadoc, thread non-safeness maybe
 public class MetricUpdater {
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index 4fafe1bdf88..754dd1715d3 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -94,8 +94,6 @@ rm -f $ZOOKEEPER_LOG_FILE*lck
 # common setup
 export VESPA_LOG_TARGET=file:${VESPA_HOME}logs/vespa/vespa.log
 export VESPA_LOG_CONTROL_DIR="${VESPA_HOME}var/db/vespa/logcontrol"
-export VESPA_LOG_CONTROL_DIR=${VESPA_HOME}var/db/vespa/logcontrol
-export VESPA_LOG_CONTROL_FILE=${VESPA_HOME}var/db/vespa/logcontrol/configserver.logcontrol
 export VESPA_LOG_CONTROL_FILE="${VESPA_HOME}var/db/vespa/logcontrol/configserver.logcontrol"
 export VESPA_SERVICE_NAME=configserver
 export LD_LIBRARY_PATH=${VESPA_HOME}lib64
@@ -130,6 +128,7 @@ jvmargs="$baseuserargs $serveruserargs"
 
 printenv > $cfpfile
 mkdir -p $bundlecachedir
+chown -R yahoo $bundlecachedir
 
 run-as-yahoo vespa-runserver -s configserver -r 30 -p $pidfile -- \
 	java \
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
index 03cb5ada8ad..1bd9249644b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.*;
 /**
  * Unit tests for ZooKeeperClient.
  *
- * @author <a href="mailto:musum@yahoo-inc.com">Harald Musum</a>
+ * @author hmusum
  */
 public class ZooKeeperClientTest extends TestWithCurator {
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java
index 22607e8fc26..6f4ca93fb07 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.*;
 /**
  * Base class for handler tests
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.14
  */
 public class HandlerTest {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionCreateHandlerTestBase.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionCreateHandlerTestBase.java
index 6a6a4097319..74211196174 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionCreateHandlerTestBase.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionCreateHandlerTestBase.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertTrue;
  * Tests for session create handlers, to make it easier to have
  * similar tests for more than one version of the API.
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.28
  */
 public abstract class SessionCreateHandlerTestBase extends SessionHandlerTest {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionExampleHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionExampleHandlerTest.java
index 2d7e293fb3c..09cc00af45f 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionExampleHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionExampleHandlerTest.java
@@ -21,7 +21,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
 /**
- * @author musum
+ * @author hmusum
  * @since 5.1.14
  */
 public class SessionExampleHandlerTest {
@@ -48,7 +48,7 @@ public class SessionExampleHandlerTest {
     /**
      * A handler that prepares a session given by an id in the request.
      *
-     * @author musum
+     * @author hmusum
      * @since 5.1.14
      */
     public static class SessionExampleHandler extends ThreadedHttpRequestHandler {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
index d38b7f9e586..da5283aeecd 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
@@ -23,7 +23,7 @@ import java.util.Optional;
 /**
  * Base class for session handler tests
  *
- * @author musum
+ * @author hmusum
  * @since 5.1.14
  */
 public class SessionHandlerTest {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionPrepareHandlerTestBase.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionPrepareHandlerTestBase.java
index 885d4164196..85eae0c91cc 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionPrepareHandlerTestBase.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionPrepareHandlerTestBase.java
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 /**
- * @author musum
+ * @author hmusum
  * @since 5.1.14
  */
 public abstract class SessionPrepareHandlerTestBase extends SessionHandlerTest {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
index 1eb38902e3f..5171277c873 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
- * @author musum
+ * @author hmusum
  * @since 5.4
  */
 public class ApplicationHandlerTest {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
index 50ef9176771..894990a5c1b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
@@ -19,7 +19,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
 /**
- * @author musum
+ * @author hmusum
  * @since 5.4
  */
 public class HostHandlerTest {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
index d31cdc1d1e1..e31d485f4df 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.*;
 import static com.yahoo.jdisc.http.HttpRequest.Method.*;
 
 /**
- * @author musum
+ * @author hmusum
  * @since 5.1
  */
 public class SessionCreateHandlerTest extends SessionCreateHandlerTestBase {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
index 0a5d4a1843c..3307c016939 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 /**
- * @author musum
+ * @author hmusum
  *
  * @since 5.1.14
  */
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
index 9faba599e3a..8ab57990bb2 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
- * @author musum
+ * @author hmusum
  */
 public class PrepareParamsTest {
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepoTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepoTest.java
index 8549902faf0..96d0181161c 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepoTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepoTest.java
@@ -10,7 +10,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 
 /**
- * @author musum
+ * @author hmusum
  * @since 5.1.14
  */
 public class SessionRepoTest {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ConfigCuratorTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ConfigCuratorTest.java
index b370b148fe0..dc310fdd113 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ConfigCuratorTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ConfigCuratorTest.java
@@ -10,7 +10,7 @@ import static org.junit.Assert.*;
 /**
  * Tests the ZKFacade using a curator mock.
  *
- * @author <a href="musum@yahoo-inc.com">Harald Musum</a>
+ * @author hmusum
  */
 public class ConfigCuratorTest {