Merge branch 'master' into balder/milliseconds-in-config-rebased-1

2 files changed, 1 insertions, 1 deletions

diff --git a/storage/src/vespa/storage/storageserver/fnetlistener.cpp b/storage/src/vespa/storage/storageserver/fnetlistener.cpp
index 2f1cdc74ce1..c86e1671033 100644
--- a/storage/src/vespa/storage/storageserver/fnetlistener.cpp
+++ b/storage/src/vespa/storage/storageserver/fnetlistener.cpp
@@ -117,6 +117,7 @@ FNetListener::RPC_getCurrentTime(FRT_RPCRequest *req)
         req->SetError(RPCRequestWrapper::ERR_NODE_SHUTTING_DOWN, "Node shutting down");
         return;
     }
+    //TODO Should we unify on std::chrono here too ?
     struct timespec t;
     clock_gettime(CLOCK_REALTIME, &t);
     req->GetReturn()->AddInt64(t.tv_sec);
diff --git a/storage/src/vespa/storage/storageserver/fnetlistener.h b/storage/src/vespa/storage/storageserver/fnetlistener.h
index 8d24311bc57..205a5af4586 100644
--- a/storage/src/vespa/storage/storageserver/fnetlistener.h
+++ b/storage/src/vespa/storage/storageserver/fnetlistener.h
@@ -11,7 +11,6 @@ namespace storage {
 namespace api { class StorageMessage; }
 
 class MessageEnqueuer;
-class StorageServerInterface;
 
 class FNetListener :  public FRT_Invokable
 {