From 365972496256236dfd3599d547a167af0d2d4de2 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Fri, 26 Oct 2018 11:03:28 +0000 Subject: Revert "Merge pull request #7409 from vespa-engine/revert-7380-bratseth/segment-yql-by-default" This reverts commit 1cb09174cb579936eae49f7db632113795b0666a, reversing changes made to eedcfc980db65da04eaca866693ef215f337f325. --- jdisc_core/src/main/java/com/yahoo/jdisc/Timer.java | 1 + 1 file changed, 1 insertion(+) (limited to 'jdisc_core/src/main/java/com/yahoo/jdisc/Timer.java') diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/Timer.java b/jdisc_core/src/main/java/com/yahoo/jdisc/Timer.java index a822ed46ef9..a111425fbc0 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/Timer.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/Timer.java @@ -35,4 +35,5 @@ public interface Timer { default Instant currentTime() { return Instant.ofEpochMilli(currentTimeMillis()); } + } -- cgit v1.2.3