Merge pull request #8198 from vespa-engine/7

7 MERGEOK

1 files changed, 0 insertions, 50 deletions

diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index 8c8c241a5dd..dc13bd1807d 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -595,7 +595,6 @@
     ],
     "fields": [
       "public static final java.lang.String CONTENT_TYPE",
-      "public static final java.lang.String DATE",
       "protected final java.util.logging.Logger log"
     ]
   },
@@ -671,21 +670,6 @@
       "public final int code"
     ]
   },
-  "com.yahoo.container.protect.FreezeDetector": {
-    "superClass": "com.yahoo.component.AbstractComponent",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.container.core.DiagnosticsConfig)",
-      "public void register(com.yahoo.concurrent.ThreadLocalDirectory)",
-      "public boolean isBreakdown()",
-      "public void unRegister(com.yahoo.concurrent.ThreadLocalDirectory)",
-      "public void deconstruct()"
-    ],
-    "fields": []
-  },
   "com.yahoo.container.protect.ProcessTerminator": {
     "superClass": "java.lang.Object",
     "interfaces": [],
@@ -699,40 +683,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.container.protect.TimeoutCollector": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.concurrent.ThreadLocalDirectory$Updater"
-    ],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public com.yahoo.container.protect.TimeoutRate createGenerationInstance(com.yahoo.container.protect.TimeoutRate)",
-      "public com.yahoo.container.protect.TimeoutRate update(com.yahoo.container.protect.TimeoutRate, java.lang.Boolean)",
-      "public bridge synthetic java.lang.Object update(java.lang.Object, java.lang.Object)",
-      "public bridge synthetic java.lang.Object createGenerationInstance(java.lang.Object)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.container.protect.TimeoutRate": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void addQuery(java.lang.Boolean)",
-      "public void merge(com.yahoo.container.protect.TimeoutRate)",
-      "public double timeoutFraction()",
-      "public int getTotal()"
-    ],
-    "fields": []
-  },
   "com.yahoo.processing.handler.AbstractProcessingHandler": {
     "superClass": "com.yahoo.container.jdisc.LoggingRequestHandler",
     "interfaces": [],