wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge 5.2

This commit is contained in:
Evan Tschannen 2018-07-31 17:01:16 -07:00
parent a361a785e8 df69239dea
commit 922374b756
5 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bindings/java/src/main/com/apple/foundationdb/FDBDatabase.java
View File

@ -45,7 +45,7 @@ class FDBDatabase extends NativeObjectWrapper implements Database, OptionConsume
@Override
public <T> T run(Function<? super Transaction, T> retryable, Executor e) {
Transaction t = this.createTransaction();
Transaction t = this.createTransaction(e);
try {
while (true) {
try {
@ -63,7 +63,7 @@ class FDBDatabase extends NativeObjectWrapper implements Database, OptionConsume
@Override
public <T> T read(Function<? super ReadTransaction, T> retryable, Executor e) {
return this.run(retryable);
return this.run(retryable, e);
}
@Override

24
documentation/sphinx/source/downloads.rst
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-5.2.6.pkg <https://www.foundationdb.org/downloads/5.2.6/macOS/installers/FoundationDB-5.2.6.pkg>`_
* `FoundationDB-5.2.7.pkg <https://www.foundationdb.org/downloads/5.2.7/macOS/installers/FoundationDB-5.2.7.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-5.2.6-1_amd64.deb <https://www.foundationdb.org/downloads/5.2.6/ubuntu/installers/foundationdb-clients_5.2.6-1_amd64.deb>`_
* `foundationdb-server-5.2.6-1_amd64.deb <https://www.foundationdb.org/downloads/5.2.6/ubuntu/installers/foundationdb-server_5.2.6-1_amd64.deb>`_ (depends on the clients package)
* `foundationdb-clients-5.2.7-1_amd64.deb <https://www.foundationdb.org/downloads/5.2.7/ubuntu/installers/foundationdb-clients_5.2.7-1_amd64.deb>`_
* `foundationdb-server-5.2.7-1_amd64.deb <https://www.foundationdb.org/downloads/5.2.7/ubuntu/installers/foundationdb-server_5.2.7-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-5.2.6-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/5.2.6/rhel6/installers/foundationdb-clients-5.2.6-1.el6.x86_64.rpm>`_
* `foundationdb-server-5.2.6-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/5.2.6/rhel6/installers/foundationdb-server-5.2.6-1.el6.x86_64.rpm>`_ (depends on the clients package)
* `foundationdb-clients-5.2.7-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/5.2.7/rhel6/installers/foundationdb-clients-5.2.7-1.el6.x86_64.rpm>`_
* `foundationdb-server-5.2.7-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/5.2.7/rhel6/installers/foundationdb-server-5.2.7-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-5.2.6-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/5.2.6/rhel7/installers/foundationdb-clients-5.2.6-1.el7.x86_64.rpm>`_
* `foundationdb-server-5.2.6-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/5.2.6/rhel7/installers/foundationdb-server-5.2.6-1.el7.x86_64.rpm>`_ (depends on the clients package)
* `foundationdb-clients-5.2.7-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/5.2.7/rhel7/installers/foundationdb-clients-5.2.7-1.el7.x86_64.rpm>`_
* `foundationdb-server-5.2.7-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/5.2.7/rhel7/installers/foundationdb-server-5.2.7-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-5.2.6-x64.msi <https://www.foundationdb.org/downloads/5.2.6/windows/installers/foundationdb-5.2.6-x64.msi>`_
* `foundationdb-5.2.7-x64.msi <https://www.foundationdb.org/downloads/5.2.7/windows/installers/foundationdb-5.2.7-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-5.2.6.tar.gz <https://www.foundationdb.org/downloads/5.2.6/bindings/python/foundationdb-5.2.6.tar.gz>`_
* `foundationdb-5.2.7.tar.gz <https://www.foundationdb.org/downloads/5.2.7/bindings/python/foundationdb-5.2.7.tar.gz>`_
Ruby 1.9.3/2.0.0+
-----------------
* `fdb-5.2.6.gem <https://www.foundationdb.org/downloads/5.2.6/bindings/ruby/fdb-5.2.6.gem>`_
* `fdb-5.2.7.gem <https://www.foundationdb.org/downloads/5.2.7/bindings/ruby/fdb-5.2.7.gem>`_
Java 8+
-------
* `fdb-java-5.2.6.jar <https://www.foundationdb.org/downloads/5.2.6/bindings/java/fdb-java-5.2.6.jar>`_
* `fdb-java-5.2.6-javadoc.jar <https://www.foundationdb.org/downloads/5.2.6/bindings/java/fdb-java-5.2.6-javadoc.jar>`_
* `fdb-java-5.2.7.jar <https://www.foundationdb.org/downloads/5.2.7/bindings/java/fdb-java-5.2.7.jar>`_
* `fdb-java-5.2.7-javadoc.jar <https://www.foundationdb.org/downloads/5.2.7/bindings/java/fdb-java-5.2.7-javadoc.jar>`_
Go 1.1+
-------

8
documentation/sphinx/source/release-notes.rst
View File

@ -2,6 +2,14 @@
Release Notes
#############
5.2.8
=====
Bindings
--------
* Java: ``FDBDatabase::run`` and ``FDBDatabase::read`` now use the ``Executor`` provided for executing asynchronous callbacks instead of the default one for the database. `(Issue #640) <https://github.com/apple/foundationdb/issues/640>`_
5.2.7
=====

2
packaging/msi/FDBInstaller.wxs
View File

@ -32,7 +32,7 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Product Name='$(var.Title)'
Id='{17E755FF-984D-4794-9FB7-F5EF61EFA6B6}'
Id='{25D03E2C-9661-443B-BB12-35DB1FF0F758}'
UpgradeCode='{A95EA002-686E-4164-8356-C715B7F8B1C8}'
Version='$(var.Version)'
Manufacturer='$(var.Manufacturer)'

2
versions.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Version>5.2.6</Version>
<Version>5.2.8</Version>
<PackageName>5.2</PackageName>
</PropertyGroup>
</Project>