Merge with master

1 files changed, 0 insertions, 16 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
index dfa2d2cefb0..3b75be5167d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
@@ -510,22 +510,6 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
     }
 
     /**
-     * Sets up this service to be included when generating monitoring config.
-     * The ymon service name used will be {@link #getServiceType()}
-     */
-    public void monitorService() {
-        monitorService(getServiceType());
-    }
-
-    /**
-     * Sets up this service to be included when generating ymon config.
-     * @param ymonServiceName the ymon service name to be used
-     */
-    public void monitorService(String ymonServiceName) {
-        setProp("ymonService", ymonServiceName);
-    }
-
-    /**
      *
      * The service HTTP port for health status
      * @return portnumber