summaryrefslogtreecommitdiffstats
path: root/jdisc_core
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-10-26 11:03:28 +0000
committerJon Bratseth <bratseth@oath.com>2018-10-26 11:03:28 +0000
commit365972496256236dfd3599d547a167af0d2d4de2 (patch)
treea9851548e37b765fac222f35e30008e6cc0c82af /jdisc_core
parent57ba28e794416ae7cc6e14660249459dac7df937 (diff)
Revert "Merge pull request #7409 from vespa-engine/revert-7380-bratseth/segment-yql-by-default"
This reverts commit 1cb09174cb579936eae49f7db632113795b0666a, reversing changes made to eedcfc980db65da04eaca866693ef215f337f325.
Diffstat (limited to 'jdisc_core')
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/Timer.java1
1 files changed, 1 insertions, 0 deletions
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());
}
+
}