Merge branch 'master' into dybis/update-author

9 files changed, 9 insertions, 9 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
index 351af7f2563..fd3c8ed4c49 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
@@ -6,7 +6,7 @@ package com.yahoo.container.handler;
  * The coverage report for a result set.
  *
  * @author  <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @author balder
+ * @author baldersheim
  */
 public class Coverage {
 
diff --git a/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java b/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java
index 51e1c0c1d53..474c2f1a4a2 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java
@@ -23,7 +23,7 @@ import com.yahoo.jdisc.Metric;
  * Request an Executor injected in your component constructor if you want to use it.
  *
  * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
  * @author bratseth
  */
 public class ThreadPoolProvider extends AbstractComponent implements Provider<Executor> {
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java
index dadac8e8f16..7c114e0097b 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java
@@ -33,7 +33,7 @@ import static com.yahoo.jdisc.http.HttpRequest.Method;
  * and are thus immutable. If you need mutable abstractions, use a higher level
  * framework, e.g. Processing.
  *
- * @author musum
+ * @author hmusum
  * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  * @since 5.1
  */
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java b/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java
index 1bd8e3089a7..cd91d2d914c 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java
@@ -13,7 +13,7 @@ import java.util.Collections;
 /**
  * An HTTP response as an opaque payload with headers and content type.
  *
- * @author musum
+ * @author hmusum
  * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  * @since 5.1
  */
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
index e23104e484f..205dbcd9ce8 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
@@ -23,7 +23,7 @@ import java.util.logging.Logger;
  * {@link #handle(HttpRequest)} method in this class and the
  * {@link HttpResponse#render(java.io.OutputStream)} method.
  *
- * @author musum
+ * @author hmusum
  * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  * @author bratseth
  * @since 5.1
diff --git a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java
index a463cfa2ba1..5cbe590c030 100644
--- a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java
+++ b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java
@@ -47,7 +47,7 @@ import static com.yahoo.component.chain.ChainsConfigurer.prepareChainRegistry;
  * <p>
  * COMPONENT: The type of the processing components of which this executes a chain
  *
- * @author  <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author  bratseth
  * @author  tonyv
  * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  * @since   5.1.6
diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java
index efca279cd38..2ce345ad355 100644
--- a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java
+++ b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java
@@ -30,7 +30,7 @@ import com.yahoo.processing.response.DataList;
  * A response from running a request through processing. This response is just a
  * wrapper of the knowhow needed to render the Response from processing.
  *
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
  * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  * @since 5.1.12
  */
diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java
index b02c0fcccdb..7f656c61db4 100644
--- a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java
+++ b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java
@@ -22,7 +22,7 @@ import java.util.concurrent.Executors;
  * A helper for making processing requests and rendering their responses.
  * Create an instance of this to test making processing requests and get the response or response data.
  *
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
  * @since 5.21
  */
 @Beta
diff --git a/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java b/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java
index 195ecc73e9f..a9b8a9a67e2 100644
--- a/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java
+++ b/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java
@@ -12,7 +12,7 @@ import java.util.Map;
  * A processor which adds the current content of the Request.properties() to
  * the trace before calling the next processor, if traceLevel is 4 or more.
  *
- * @author  <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author  bratseth
  * @since   5.1.17
  */
 public class RequestPropertyTracer extends Processor {