diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2017-04-24 12:10:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-24 12:10:42 +0200 |
| commit | 9ff4bdb407ed8d855a3f86a17c99906ff738177b (patch) | |
| tree | fc2b050224d7dde92d57e1f9cac12c1e5aaf6b90 /storage/src/tests/persistence/mergehandlertest.cpp | |
| parent | 32ae190acc9ac5081049e1c7008d1602c68cf821 (diff) | |
Revert "Balder/enforce override 2"
Diffstat (limited to 'storage/src/tests/persistence/mergehandlertest.cpp')
| -rw-r--r-- | storage/src/tests/persistence/mergehandlertest.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/src/tests/persistence/mergehandlertest.cpp b/storage/src/tests/persistence/mergehandlertest.cpp index 3f0623fbef0..8147992a516 100644 --- a/storage/src/tests/persistence/mergehandlertest.cpp +++ b/storage/src/tests/persistence/mergehandlertest.cpp @@ -3,13 +3,15 @@ #include <vespa/document/base/testdocman.h> #include <vespa/storage/persistence/mergehandler.h> #include <vespa/vdstestlib/cppunit/macros.h> +#include <vespa/storageapi/message/bucket.h> +#include <vespa/log/log.h> #include <tests/persistence/persistencetestutils.h> #include <tests/persistence/common/persistenceproviderwrapper.h> #include <tests/distributor/messagesenderstub.h> +#include <vespa/storageframework/defaultimplementation/clock/fakeclock.h> #include <vespa/vespalib/objects/nbostream.h> #include <cmath> -#include <vespa/log/log.h> LOG_SETUP(".test.persistence.handler.merge"); namespace storage { |