diff options
| author | Henning Baldersheim <balder@oath.com> | 2018-03-16 22:33:33 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@oath.com> | 2018-03-19 10:01:07 +0100 |
| commit | 3eb15d2eabb0b170c96de7241aa2eed7d5d27879 (patch) | |
| tree | ff363b717ba0f591904a55388b5e09683c1f7165 /storage/src/tests/persistence | |
| parent | 9335569e415a04beaab3ebcb62e02faf37be7ad3 (diff) | |
Remove DocumentList with children...
Conflicts:
storage/src/tests/persistence/filestorage/filestormanagertest.cpp
Resolve merge conflict.
Diffstat (limited to 'storage/src/tests/persistence')
| -rw-r--r-- | storage/src/tests/persistence/filestorage/filestormanagertest.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp index 70890a7c1d3..8d03c9de54c 100644 --- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp +++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp @@ -20,11 +20,6 @@ #include <vespa/document/fieldvalue/stringfieldvalue.h> #include <vespa/document/select/parser.h> #include <vespa/vdslib/state/random.h> -#include <vespa/vdslib/container/mutabledocumentlist.h> -#include <vespa/vdstestlib/cppunit/macros.h> -#include <vespa/vespalib/io/fileutil.h> -#include <vespa/vespalib/util/stringfmt.h> -#include <vespa/storageapi/message/bucket.h> #include <vespa/storageapi/message/bucketsplitting.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> #include <vespa/persistence/spi/test.h> |