Merge branch 'verify-trigger'
authorJens Axboe <axboe@fb.com>
Tue, 11 Nov 2014 18:10:35 +0000 (11:10 -0700)
committerJens Axboe <axboe@fb.com>
Tue, 11 Nov 2014 18:10:35 +0000 (11:10 -0700)
FIO-VERSION-GEN
os/windows/install.wxs

index 3057fed3ec541e72f52c62b0d39dbad83d46779c..e2052c44a7f8a81c237f4751214d32182b98b93d 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=FIO-VERSION-FILE
-DEF_VER=fio-2.1.13
+DEF_VER=fio-2.1.14
 
 LF='
 '
index 7338d635c64dfb95956531471438964dd7840f9d..3e15676efb96be62c7da8467d1979573b6cf9302 100755 (executable)
@@ -10,7 +10,7 @@
        <Product Id="*"
          Codepage="1252" Language="1033"
          Manufacturer="fio" Name="fio"
-         UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.1.13">
+         UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.1.14">
                <Package
                  Description="Flexible IO Tester"
                  InstallerVersion="301" Keywords="Installer,MSI,Database"