Revert "Merge pull request #15581 from vespa-engine/revert-15578-bratseth/apply-on-restart-take-10"

This reverts commit 4cf13bc7db215e77f7688e429f700880c115fe76, reversing
changes made to e21f385bd4f21326608f3a69325df4e96d4a65e5.

2 files changed, 6 insertions, 5 deletions

diff --git a/config/src/tests/configagent/configagent.cpp b/config/src/tests/configagent/configagent.cpp
index a7cc95ab883..7cc0abee0bc 100644
--- a/config/src/tests/configagent/configagent.cpp
+++ b/config/src/tests/configagent/configagent.cpp
@@ -36,7 +36,7 @@ public:
           _value(value),
           _fillCalled(false),
           _valid(valid),
-          _state(md5, timestamp, false),
+          _state(md5, timestamp, false, false),
           _errorMessage(errorMsg),
           _errorCode(errorC0de),
           _isError(iserror)
@@ -142,6 +142,7 @@ TEST("require that agent returns correct values") {
     ASSERT_EQUAL(cs.md5, handler.getConfigState().md5);
     ASSERT_EQUAL(cs.generation, handler.getConfigState().generation);
     ASSERT_EQUAL(cs.internalRedeploy, handler.getConfigState().internalRedeploy);
+    ASSERT_EQUAL(cs.applyOnRestart, handler.getConfigState().applyOnRestart);
 }
 
 TEST("require that successful request is delivered to holder") {
diff --git a/config/src/tests/frt/frt.cpp b/config/src/tests/frt/frt.cpp
index 0d70605fa62..60973aea2bf 100644
--- a/config/src/tests/frt/frt.cpp
+++ b/config/src/tests/frt/frt.cpp
@@ -276,10 +276,10 @@ TEST("require that v3 request is correctly initialized") {
     traceIn.trace(2, "Hei");
     FRTConfigRequestV3 v3req(&conn, key, md5, currentGeneration, hostName,
                              timeout, traceIn, VespaVersion::fromString("1.2.3"), CompressionType::LZ4);
-    ASSERT_TRUE(v3req.verifyState(ConfigState(md5, 3, false)));
-    ASSERT_FALSE(v3req.verifyState(ConfigState(md5, 2, false)));
-    ASSERT_FALSE(v3req.verifyState(ConfigState("xxx", 3, false)));
-    ASSERT_FALSE(v3req.verifyState(ConfigState("xxx", 2, false)));
+    ASSERT_TRUE(v3req.verifyState(ConfigState(md5, 3, false, false)));
+    ASSERT_FALSE(v3req.verifyState(ConfigState(md5, 2, false, false)));
+    ASSERT_FALSE(v3req.verifyState(ConfigState("xxx", 3, false, false)));
+    ASSERT_FALSE(v3req.verifyState(ConfigState("xxx", 2, false, false)));
 
     ConfigDefinition origDef(MyConfig::CONFIG_DEF_SCHEMA);