From 985e1de4673e2541680020ecfeeaa84f3d163986 Mon Sep 17 00:00:00 2001 From: Evan Tschannen Date: Tue, 2 Apr 2019 18:39:24 -0700 Subject: [PATCH] Update documentation and protocol version for release 6.1.0 --- bindings/go/README.md | 2 +- build/cmake/package_tester/modules/tests.sh | 2 +- documentation/sphinx/source/downloads.rst | 24 ++++++++++----------- flow/Net2.actor.cpp | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bindings/go/README.md b/bindings/go/README.md index 14e6358932..34d4041cb0 100644 --- a/bindings/go/README.md +++ b/bindings/go/README.md @@ -7,7 +7,7 @@ This package requires: - Go 1.1+ with CGO enabled - [Mono](http://www.mono-project.com/) (macOS or Linux) or [Visual Studio](https://www.visualstudio.com/) (Windows) (build-time only) -- FoundationDB C API 2.0.x-6.0.x (part of the [FoundationDB client packages](https://apple.github.io/foundationdb/downloads.html#c)) +- FoundationDB C API 2.0.x-6.1.x (part of the [FoundationDB client packages](https://apple.github.io/foundationdb/downloads.html#c)) Use of this package requires the selection of a FoundationDB API version at runtime. This package currently supports FoundationDB API versions 200-610. diff --git a/build/cmake/package_tester/modules/tests.sh b/build/cmake/package_tester/modules/tests.sh index aeb0a12135..77383cfa3b 100644 --- a/build/cmake/package_tester/modules/tests.sh +++ b/build/cmake/package_tester/modules/tests.sh @@ -65,7 +65,7 @@ then python setup.py install successOr "Installing python bindings failed" popd - python -c 'import fdb; fdb.api_version(600)' + python -c 'import fdb; fdb.api_version(610)' successOr "Loading python bindings failed" } diff --git a/documentation/sphinx/source/downloads.rst b/documentation/sphinx/source/downloads.rst index f6c99427ea..43cf5aab08 100644 --- a/documentation/sphinx/source/downloads.rst +++ b/documentation/sphinx/source/downloads.rst @@ -10,38 +10,38 @@ macOS The macOS installation package is supported on macOS 10.7+. It includes the client and (optionally) the server. -* `FoundationDB-6.0.18.pkg `_ +* `FoundationDB-6.1.0.pkg `_ Ubuntu ------ The Ubuntu packages are supported on 64-bit Ubuntu 12.04+, but beware of the Linux kernel bug in Ubuntu 12.x. -* `foundationdb-clients-6.0.18-1_amd64.deb `_ -* `foundationdb-server-6.0.18-1_amd64.deb `_ (depends on the clients package) +* `foundationdb-clients-6.1.0-1_amd64.deb `_ +* `foundationdb-server-6.1.0-1_amd64.deb `_ (depends on the clients package) RHEL/CentOS EL6 --------------- The RHEL/CentOS EL6 packages are supported on 64-bit RHEL/CentOS 6.x. -* `foundationdb-clients-6.0.18-1.el6.x86_64.rpm `_ -* `foundationdb-server-6.0.18-1.el6.x86_64.rpm `_ (depends on the clients package) +* `foundationdb-clients-6.1.0-1.el6.x86_64.rpm `_ +* `foundationdb-server-6.1.0-1.el6.x86_64.rpm `_ (depends on the clients package) RHEL/CentOS EL7 --------------- The RHEL/CentOS EL7 packages are supported on 64-bit RHEL/CentOS 7.x. -* `foundationdb-clients-6.0.18-1.el7.x86_64.rpm `_ -* `foundationdb-server-6.0.18-1.el7.x86_64.rpm `_ (depends on the clients package) +* `foundationdb-clients-6.1.0-1.el7.x86_64.rpm `_ +* `foundationdb-server-6.1.0-1.el7.x86_64.rpm `_ (depends on the clients package) Windows ------- The Windows installer is supported on 64-bit Windows XP and later. It includes the client and (optionally) the server. -* `foundationdb-6.0.18-x64.msi `_ +* `foundationdb-6.1.0-x64.msi `_ API Language Bindings ===================== @@ -58,18 +58,18 @@ On macOS and Windows, the FoundationDB Python API bindings are installed as part If you need to use the FoundationDB Python API from other Python installations or paths, download the Python package: -* `foundationdb-6.0.18.tar.gz `_ +* `foundationdb-6.1.0.tar.gz `_ Ruby 1.9.3/2.0.0+ ----------------- -* `fdb-6.0.18.gem `_ +* `fdb-6.1.0.gem `_ Java 8+ ------- -* `fdb-java-6.0.18.jar `_ -* `fdb-java-6.0.18-javadoc.jar `_ +* `fdb-java-6.1.0.jar `_ +* `fdb-java-6.1.0-javadoc.jar `_ Go 1.1+ ------- diff --git a/flow/Net2.actor.cpp b/flow/Net2.actor.cpp index 6633b2e635..47e50e45cc 100644 --- a/flow/Net2.actor.cpp +++ b/flow/Net2.actor.cpp @@ -55,7 +55,7 @@ using namespace boost::asio::ip; // // xyzdev // vvvv -const uint64_t currentProtocolVersion = 0x0FDB00B061050001LL; +const uint64_t currentProtocolVersion = 0x0FDB00B061060001LL; const uint64_t compatibleProtocolVersionMask = 0xffffffffffff0000LL; const uint64_t minValidProtocolVersion = 0x0FDB00A200060001LL;