diff options
author | Geir Storli <geirst@oath.com> | 2018-01-30 11:48:40 +0000 |
---|---|---|
committer | Geir Storli <geirst@oath.com> | 2018-01-30 11:48:40 +0000 |
commit | 3bffe9e5c6c7eefd681d6b4a21adaa012b9946de (patch) | |
tree | bb983e1f1b1367dc755dc71a6cfa5b120d00a535 /documentapi | |
parent | 2b8323b52f316f47ba2dc76f8589f6be4ad38319 (diff) |
Change version of new document API protocol to 6.999 to avoid activation yet.
Diffstat (limited to 'documentapi')
4 files changed, 4 insertions, 4 deletions
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java index d8ee2a39ecd..57e7070296f 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java @@ -298,7 +298,7 @@ public class DocumentProtocol implements Protocol { VersionSpecification version50 = new VersionSpecification(5, 0); VersionSpecification version51 = new VersionSpecification(5, 1); VersionSpecification version52 = new VersionSpecification(5, 115); - VersionSpecification version6 = new VersionSpecification(6, 197); // TODO change once stable protocol + VersionSpecification version6 = new VersionSpecification(6, 999); // TODO change once stable protocol // TODO ensure version semantics List<VersionSpecification> from50 = Arrays.asList(version50, version51, version52, version6); diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java index 6e7990f8f3c..6bb9207edd0 100644 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java @@ -18,7 +18,7 @@ public class Messages60TestCase extends Messages52TestCase { @Override protected Version version() { - return new Version(6, 197); // TODO finalize version + return new Version(6, 999); // TODO finalize version } @Override diff --git a/documentapi/src/tests/messages/messages60test.h b/documentapi/src/tests/messages/messages60test.h index c5ed2cc746c..597eace067b 100644 --- a/documentapi/src/tests/messages/messages60test.h +++ b/documentapi/src/tests/messages/messages60test.h @@ -6,7 +6,7 @@ class Messages60Test : public Messages52Test { protected: // TODO finalize version - const vespalib::Version getVersion() const override { return vespalib::Version(6, 197); } + const vespalib::Version getVersion() const override { return vespalib::Version(6, 999); } public: Messages60Test(); bool testCreateVisitorMessage(); diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp index dead78faa4b..dd2e73c9d9b 100644 --- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp @@ -50,7 +50,7 @@ DocumentProtocol::DocumentProtocol(const LoadTypeSet& loadTypes, vespalib::VersionSpecification version50(5, 0); vespalib::VersionSpecification version51(5, 1); vespalib::VersionSpecification version52(5, 115); - vespalib::VersionSpecification version6(6, 197); // TODO finalize version + vespalib::VersionSpecification version6(6, 999); // TODO finalize version std::vector<vespalib::VersionSpecification> from50 = { version50, version51, version52, version6 }; std::vector<vespalib::VersionSpecification> from51 = { version51, version52, version6 }; |