Merge pull request #756 from apkar/master

Merge branch release-6.0
This commit is contained in:
Evan Tschannen 2018-09-07 10:00:00 -07:00 committed by GitHub
commit 2f2aaf5bce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions

View File

@ -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.9.pkg <https://www.foundationdb.org/downloads/6.0.9/macOS/installers/FoundationDB-6.0.9.pkg>`_
* `FoundationDB-6.0.10.pkg <https://www.foundationdb.org/downloads/6.0.10/macOS/installers/FoundationDB-6.0.10.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.9-1_amd64.deb <https://www.foundationdb.org/downloads/6.0.9/ubuntu/installers/foundationdb-clients_6.0.9-1_amd64.deb>`_
* `foundationdb-server-6.0.9-1_amd64.deb <https://www.foundationdb.org/downloads/6.0.9/ubuntu/installers/foundationdb-server_6.0.9-1_amd64.deb>`_ (depends on the clients package)
* `foundationdb-clients-6.0.10-1_amd64.deb <https://www.foundationdb.org/downloads/6.0.10/ubuntu/installers/foundationdb-clients_6.0.10-1_amd64.deb>`_
* `foundationdb-server-6.0.10-1_amd64.deb <https://www.foundationdb.org/downloads/6.0.10/ubuntu/installers/foundationdb-server_6.0.10-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.9-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/6.0.9/rhel6/installers/foundationdb-clients-6.0.9-1.el6.x86_64.rpm>`_
* `foundationdb-server-6.0.9-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/6.0.9/rhel6/installers/foundationdb-server-6.0.9-1.el6.x86_64.rpm>`_ (depends on the clients package)
* `foundationdb-clients-6.0.10-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/6.0.10/rhel6/installers/foundationdb-clients-6.0.10-1.el6.x86_64.rpm>`_
* `foundationdb-server-6.0.10-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/6.0.10/rhel6/installers/foundationdb-server-6.0.10-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.9-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/6.0.9/rhel7/installers/foundationdb-clients-6.0.9-1.el7.x86_64.rpm>`_
* `foundationdb-server-6.0.9-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/6.0.9/rhel7/installers/foundationdb-server-6.0.9-1.el7.x86_64.rpm>`_ (depends on the clients package)
* `foundationdb-clients-6.0.10-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/6.0.10/rhel7/installers/foundationdb-clients-6.0.10-1.el7.x86_64.rpm>`_
* `foundationdb-server-6.0.10-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/6.0.10/rhel7/installers/foundationdb-server-6.0.10-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.9-x64.msi <https://www.foundationdb.org/downloads/6.0.9/windows/installers/foundationdb-6.0.9-x64.msi>`_
* `foundationdb-6.0.10-x64.msi <https://www.foundationdb.org/downloads/6.0.10/windows/installers/foundationdb-6.0.10-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.9.tar.gz <https://www.foundationdb.org/downloads/6.0.9/bindings/python/foundationdb-6.0.9.tar.gz>`_
* `foundationdb-6.0.10.tar.gz <https://www.foundationdb.org/downloads/6.0.10/bindings/python/foundationdb-6.0.10.tar.gz>`_
Ruby 1.9.3/2.0.0+
-----------------
* `fdb-6.0.9.gem <https://www.foundationdb.org/downloads/6.0.9/bindings/ruby/fdb-6.0.9.gem>`_
* `fdb-6.0.10.gem <https://www.foundationdb.org/downloads/6.0.10/bindings/ruby/fdb-6.0.10.gem>`_
Java 8+
-------
* `fdb-java-6.0.9.jar <https://www.foundationdb.org/downloads/6.0.9/bindings/java/fdb-java-6.0.9.jar>`_
* `fdb-java-6.0.9-javadoc.jar <https://www.foundationdb.org/downloads/6.0.9/bindings/java/fdb-java-6.0.9-javadoc.jar>`_
* `fdb-java-6.0.10.jar <https://www.foundationdb.org/downloads/6.0.10/bindings/java/fdb-java-6.0.10.jar>`_
* `fdb-java-6.0.10-javadoc.jar <https://www.foundationdb.org/downloads/6.0.10/bindings/java/fdb-java-6.0.10-javadoc.jar>`_
Go 1.1+
-------

View File

@ -32,7 +32,7 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Product Name='$(var.Title)'
Id='{90C29CFB-37C1-42F3-80B2-A1560145DA10}'
Id='{A4E67735-0BA5-4F66-8C3C-40605DCDC0AD}'
UpgradeCode='{A95EA002-686E-4164-8356-C715B7F8B1C8}'
Version='$(var.Version)'
Manufacturer='$(var.Manufacturer)'