Recent changes (master)

Jens Axboe
2014-04-01T12:00:07Z

The following changes since commit 9f973d1322fe387bc9b4442a23a912cfbc2203b9:

Merge branch 'master' of ssh://git.kernel.dk/data/git/fio (2014-03-28 08:09:35 -0600)

are available in the git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to f42557f8ba1fc6bbf6b5fce4ae3a53cfc8bbb35b:

Fio 2.1.7 (2014-03-31 09:05:54 -0600)

----------------------------------------------------------------
fio v2.1.7

----------------------------------------------------------------
Jens Axboe (1):
Fio 2.1.7

FIO-VERSION-GEN | 2 +-
os/windows/install.wxs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

---

Diff of recent changes:

diff --git a/FIO-VERSION-GEN b/FIO-VERSION-GEN
index 4122933..918a9df 100755
--- a/FIO-VERSION-GEN
+++ b/FIO-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh

GVF=FIO-VERSION-FILE
-DEF_VER=fio-2.1.6.1
+DEF_VER=fio-2.1.7

LF='
'
diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index df5707f..7820449 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -10,7 +10,7 @@
<Product Id="*"
Codepage="1252" Language="1033"
Manufacturer="fio" Name="fio"
- UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.1.6.1">
+ UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.1.7">
<Package
Description="Flexible IO Tester"
InstallerVersion="301" Keywords="Installer,MSI,Database"