diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-12-20 03:33:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-20 03:33:41 +0100 |
commit | f5dba6ff3c3451cc4688dcd90ca72c6e4e301946 (patch) | |
tree | 46a4a4e518971da3193d504e4f6b5bedd01b049b /storage | |
parent | e63afccea9618396374a6488519b7a894f94ac3c (diff) | |
parent | 04677306ef130fad59efa29141b6fe7b185927fe (diff) |
Merge branch 'master' into balder/reduce-timestamp-usage
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/vespa/storage/visiting/commandqueue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/src/vespa/storage/visiting/commandqueue.h b/storage/src/vespa/storage/visiting/commandqueue.h index 498cf14567d..6d9bfc1ca4f 100644 --- a/storage/src/vespa/storage/visiting/commandqueue.h +++ b/storage/src/vespa/storage/visiting/commandqueue.h @@ -16,7 +16,7 @@ #include <boost/multi_index/ordered_index.hpp> #include <boost/multi_index/sequenced_index.hpp> #include <vespa/vespalib/util/printable.h> -#include <vespa/vespalib//util/time.h> +#include <vespa/vespalib/util/time.h> #include <vespa/storageframework/generic/clock/clock.h> #include <list> #include <ostream> |