summaryrefslogtreecommitdiffstats
path: root/storageapi
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@oath.com>2018-05-04 11:45:20 +0000
committerTor Egge <Tor.Egge@oath.com>2018-05-04 11:45:20 +0000
commit9e03ededa796654cbfb57048181c18e930affd74 (patch)
tree3de53bc8974382d9439160de5f4035172e973f06 /storageapi
parent8d41cf849b2e56bde07585bcf7ef1c1416b7b49c (diff)
Enable new storage api protocol serialization.
Diffstat (limited to 'storageapi')
-rw-r--r--storageapi/src/tests/mbusprot/storageprotocoltest.cpp3
-rw-r--r--storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
index 458941f9aac..a809d80e0f5 100644
--- a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
+++ b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
@@ -44,8 +44,7 @@ struct StorageProtocolTest : public CppUnit::TestFixture {
vespalib::Version _version5_0{5, 0, 12};
vespalib::Version _version5_1{5, 1, 0};
vespalib::Version _version5_2{5, 93, 30};
- // TODO: Set correct version when bucket space serialization is activated by default
- vespalib::Version _version6_0{6, 999, 0};
+ vespalib::Version _version6_0{6, 240, 0};
documentapi::LoadTypeSet _loadTypes;
mbusprot::StorageProtocol _protocol;
static std::vector<std::string> _nonVerboseMessageStrings;
diff --git a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
index c592fb48b11..33fca0f161a 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
+++ b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
@@ -35,8 +35,7 @@ StorageProtocol::createPolicy(const mbus::string&, const mbus::string&) const
}
namespace {
- // TODO: Set correct version when bucket space serialization is activated by default
- vespalib::Version version6_0(6, 999, 0);
+ vespalib::Version version6_0(6, 240, 0);
vespalib::Version version5_2(5, 93, 30);
vespalib::Version version5_1(5, 1, 0);
vespalib::Version version5_0(5, 0, 12);