Merge pull request #648 from brownleej/release-6.0-5.2-merge

Merge release-5.2 into release-6.0
This commit is contained in:
Evan Tschannen 2018-07-31 17:02:51 -07:00 committed by GitHub
commit c3bd245fcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions

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

View File

@ -2,6 +2,27 @@
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
=====
Bindings
--------
* The go bindings now caches database connections on a per-cluster basis. `(Issue #607) <https://github.com/apple/foundationdb/issues/607>`_
Fixes
-----
* Sometimes the multi-version client would not reconnect to the cluster after the database was upgraded. `(PR #637) <https://github.com/apple/foundationdb/pull/637>`_
5.2.6
=====