aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-11-22 15:15:47 +0100
committerGitHub <noreply@github.com>2019-11-22 15:15:47 +0100
commit345d5b2716437e3e40290073225e766350d768a8 (patch)
treebcbb912347368ee87ee07e8d61106524ea7c4cd7
parent92b9285948f47a0191f6426276190550554c1d92 (diff)
parent9a7ec5cb5bbf8410f04d6d0f3795ccabde70291d (diff)
Merge pull request #11389 from vespa-engine/balder/fix-merge-issue
Follow api change
-rw-r--r--searchcore/src/apps/proton/proton.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/searchcore/src/apps/proton/proton.cpp b/searchcore/src/apps/proton/proton.cpp
index c63e3c9181c..b37eb5ac0cf 100644
--- a/searchcore/src/apps/proton/proton.cpp
+++ b/searchcore/src/apps/proton/proton.cpp
@@ -220,7 +220,7 @@ App::Main()
std::unique_ptr<ProtonServiceLayerProcess> spiProton;
if ( ! params.serviceidentity.empty()) {
spiProton = std::make_unique<ProtonServiceLayerProcess>(params.serviceidentity, proton, downPersistence.get());
- spiProton->setupConfig(params.subscribeTimeout);
+ spiProton->setupConfig(std::chrono::milliseconds(params.subscribeTimeout));
spiProton->createNode();
EV_STARTED("servicelayer");
}