diff options
-rw-r--r-- | configdefinitions/src/vespa/CMakeLists.txt | 2 | ||||
-rw-r--r-- | configdefinitions/src/vespa/bucketspaces.def (renamed from storage/src/vespa/storage/config/bucketspaces.def) | 0 | ||||
-rw-r--r-- | storage/src/vespa/storage/config/CMakeLists.txt | 2 | ||||
-rw-r--r-- | storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h | 2 | ||||
-rw-r--r-- | storage/src/vespa/storage/storageserver/configurable_bucket_resolver.h | 4 | ||||
-rw-r--r-- | storage/src/vespa/storage/storageserver/storagenode.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt index fc9be8ce91b..65b02d7dc05 100644 --- a/configdefinitions/src/vespa/CMakeLists.txt +++ b/configdefinitions/src/vespa/CMakeLists.txt @@ -74,3 +74,5 @@ vespa_generate_config(configdefinitions zookeeper-server.def) install_config_definition(zookeeper-server.def cloud.config.zookeeper-server.def) vespa_generate_config(configdefinitions zookeepers.def) install_config_definition(zookeepers.def cloud.config.zookeepers.def) +vespa_generate_config(configdefinitions bucketspaces.def) +install_config_definition(bucketspaces.def vespa.config.content.core.bucketspaces.def) diff --git a/storage/src/vespa/storage/config/bucketspaces.def b/configdefinitions/src/vespa/bucketspaces.def index 4db107ec1ee..4db107ec1ee 100644 --- a/storage/src/vespa/storage/config/bucketspaces.def +++ b/configdefinitions/src/vespa/bucketspaces.def diff --git a/storage/src/vespa/storage/config/CMakeLists.txt b/storage/src/vespa/storage/config/CMakeLists.txt index 65eeeaf3221..4a20d510043 100644 --- a/storage/src/vespa/storage/config/CMakeLists.txt +++ b/storage/src/vespa/storage/config/CMakeLists.txt @@ -28,5 +28,3 @@ vespa_generate_config(storage_storageconfig stor-prioritymapping.def) install_config_definition(stor-prioritymapping.def vespa.config.content.core.stor-prioritymapping.def) vespa_generate_config(storage_storageconfig rpc-provider.def) install_config_definition(rpc-provider.def vespa.config.content.core.rpc-provider.def) -vespa_generate_config(storage_storageconfig bucketspaces.def) -install_config_definition(bucketspaces.def vespa.config.content.core.bucketspaces.def) diff --git a/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h b/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h index afd9f11a88b..d281883856c 100644 --- a/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h +++ b/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h @@ -11,7 +11,7 @@ #include <vespa/document/repo/documenttyperepo.h> #include <vespa/documentapi/loadtypes/loadtypeset.h> #include <vespa/storage/common/storagecomponent.h> -#include <vespa/storage/config/config-bucketspaces.h> +#include <vespa/config-bucketspaces.h> #include <vespa/storage/config/config-stor-prioritymapping.h> #include <vespa/storageframework/defaultimplementation/component/componentregisterimpl.h> #include <vespa/vdslib/distribution/distribution.h> diff --git a/storage/src/vespa/storage/storageserver/configurable_bucket_resolver.h b/storage/src/vespa/storage/storageserver/configurable_bucket_resolver.h index acebd9777fb..ab296c86c4c 100644 --- a/storage/src/vespa/storage/storageserver/configurable_bucket_resolver.h +++ b/storage/src/vespa/storage/storageserver/configurable_bucket_resolver.h @@ -1,7 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/storage/config/config-bucketspaces.h> +#include <vespa/config-bucketspaces.h> #include <vespa/storage/common/bucket_resolver.h> #include <vespa/vespalib/stllike/hash_fun.h> #include <memory> @@ -33,4 +33,4 @@ public: const vespa::config::content::core::BucketspacesConfig& config); }; -}
\ No newline at end of file +} diff --git a/storage/src/vespa/storage/storageserver/storagenode.h b/storage/src/vespa/storage/storageserver/storagenode.h index a07d1c0c534..38a48ac2eed 100644 --- a/storage/src/vespa/storage/storageserver/storagenode.h +++ b/storage/src/vespa/storage/storageserver/storagenode.h @@ -19,7 +19,7 @@ #include <vespa/config/subscription/configuri.h> #include <vespa/document/config/config-documenttypes.h> #include <vespa/storage/common/doneinitializehandler.h> -#include <vespa/storage/config/config-bucketspaces.h> +#include <vespa/config-bucketspaces.h> #include <vespa/storage/config/config-stor-prioritymapping.h> #include <vespa/storage/config/config-stor-server.h> #include <vespa/storage/storageutil/resumeguard.h> |