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

Merge branch 'release-5.0' 

# Conflicts:
#	versions.target
This commit is contained in:
Evan Tschannen 2017-07-27 16:51:57 -07:00
parent 37e5e2acbb 7061d34e94
commit 9fb709cf73
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flow/genericactors.actor.h
View File

@ -239,8 +239,12 @@ Future<Void> triggerOnError( Func what, Future<Void> signal ) {
ACTOR template<class T>
void uncancellable(Future<T> what, Promise<T> result)
{
T val = wait(what);
result.send(val);
try {
T val = wait(what);
result.send(val);
} catch( Error &e ) {
result.sendError(e);
}
}
//Waits for a future to complete and cannot be cancelled

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='{E1E1FACE-6556-42A5-8F29-5E16D1418E24}'
Id='{6B9B840B-A6E2-4E07-B41A-86910C574923}'
UpgradeCode='{A95EA002-686E-4164-8356-C715B7F8B1C8}'
Version='$(var.Version)'
Manufacturer='$(var.Manufacturer)'