git.kernel.dk Git - fio.git/commit - cconv.c

projects / fio.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2a95f71 033bbb5)

author	Jens Axboe <axboe@kernel.dk>
	Mon, 7 May 2012 07:54:41 +0000 (09:54 +0200)
committer	Jens Axboe <axboe@kernel.dk>
	Mon, 7 May 2012 07:54:41 +0000 (09:54 +0200)
commit	fb390e242cac8868e01cdc2046c63e04e3d53d70
tree	3ec2d5f7aab5c432f8d6c7350cc8f2808df5c44c	tree \| snapshot
parent	2a95f716d8808f45cd5806eac0baad96b39b0016	commit \| diff
parent	033bbb5119b3135f198b7a6032d484e227d97c69	commit \| diff

Merge branch 'master' into gfio

Conflicts:
Makefile
backend.c
client.c
fio.h
os/windows/install.wxs
server.c
server.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>

HOWTO	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
backend.c	diff1 \|	diff2 \|	blob \| history
cconv.c	diff1 \|	\|	blob \| history
eta.c	diff1 \|	diff2 \|	blob \| history
filesetup.c	diff1 \|	diff2 \|	blob \| history
fio.1	diff1 \|	diff2 \|	blob \| history
options.c	diff1 \|	diff2 \|	blob \| history
stat.c	diff1 \|	diff2 \|	blob \| history
thread_options.h	diff1 \|	\|	blob \| history

fio - Flexible IO Tester