summaryrefslogtreecommitdiffstats
path: root/clustercontroller-apputil
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-09-15 16:25:49 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-09-15 16:25:49 +0200
commitc9f97f7effb5fcd2a8ffe620258cd5629fb7dc73 (patch)
tree37d884a443892a79fb3a159edd7a418523f0f928 /clustercontroller-apputil
parent147b113228e8df694e1bc37bed082fa90cd9df1f (diff)
Merge with master
Diffstat (limited to 'clustercontroller-apputil')
-rw-r--r--clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java
index 1069bd79b4f..f43f04d1aac 100644
--- a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java
+++ b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java
@@ -19,6 +19,7 @@ import java.util.logging.Logger;
/**
* Note. This class is tested through apache http instance test, using this as other endpoint.
+ *
* @author Haakon Humberset
* @author Harald Musum
* @author Vegard Sjonfjell