summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2020-11-20 21:34:38 +0100
committerGitHub <noreply@github.com>2020-11-20 21:34:38 +0100
commit278967c98483da6b1308d34bd7b2b77e2f690288 (patch)
tree13d63c2853a56d59af6129e0808c9cbe55390c2f /config-model
parentfb522c0858a32c02ff0c49217a5ed7937d563921 (diff)
Revert "Jonmv/reindexing rest api"
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java4
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/container/ContainerIncludeTest.java2
2 files changed, 1 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index d86c5e1eab6..ec8607daaca 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -119,10 +119,6 @@ public class ClusterControllerContainer extends Container implements
addFileBundle(ReindexingController.REINDEXING_CONTROLLER_BUNDLE);
addComponent(new ReindexingController(context));
addComponent(new SimpleComponent(DocumentAccessProvider.class.getName()));
- addHandler(new Handler(createComponentModel("reindexing-status",
- "ai.vespa.reindexing.http.ReindexingV1ApiHandler",
- new ComponentSpecification(ReindexingController.REINDEXING_CONTROLLER_BUNDLE))),
- "/reindexing/v1/*");
}
}
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerIncludeTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerIncludeTest.java
index 7d4be4b5e33..62a36422dd8 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerIncludeTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerIncludeTest.java
@@ -18,7 +18,7 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
/**
- * @author Einar M R Rosenvinge
+ * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
* @since 5.1.13
*/
public class ContainerIncludeTest {