From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bombadil.infradead.org ([198.137.202.9]:42495 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752213AbcEVMAF (ORCPT ); Sun, 22 May 2016 08:00:05 -0400 Received: from [216.160.245.99] (helo=kernel.dk) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1b4S38-0007VB-Vx for fio@vger.kernel.org; Sun, 22 May 2016 12:00:03 +0000 Subject: Recent changes (master) From: Jens Axboe Message-Id: <20160522120001.94EE02C00DF@kernel.dk> Date: Sun, 22 May 2016 06:00:01 -0600 (MDT) Sender: fio-owner@vger.kernel.org List-Id: fio@vger.kernel.org To: fio@vger.kernel.org The following changes since commit 2ab71dc4d39e29764f0f80a3559a0119247e1eb1: iolog: fix potential oops in iolog disabling (2016-05-20 14:36:34 -0600) are available in the git repository at: git://git.kernel.dk/fio.git master for you to fetch changes up to ac32c6a20a37e850d721aee082493838b184fed1: Fio 2.10 (2016-05-21 09:00:54 -0600) ---------------------------------------------------------------- Jens Axboe (1): Fio 2.10 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 fcdbd98..d1ba7ca 100755 --- a/FIO-VERSION-GEN +++ b/FIO-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=FIO-VERSION-FILE -DEF_VER=fio-2.9 +DEF_VER=fio-2.10 LF=' ' diff --git a/os/windows/install.wxs b/os/windows/install.wxs index 44cc938..8ae1394 100755 --- a/os/windows/install.wxs +++ b/os/windows/install.wxs @@ -10,7 +10,7 @@ + UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.10">