git.kernel.dk Git - fio.git/commit - thread_options.h

projects / fio.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a9bca4a d686990)

author	Jens Axboe <axboe@kernel.dk>
	Tue, 9 Apr 2013 18:29:16 +0000 (20:29 +0200)
committer	Jens Axboe <axboe@kernel.dk>
	Tue, 9 Apr 2013 18:29:16 +0000 (20:29 +0200)
commit	22f80458a520d0c5371c64bf91d24cdd21dff825
tree	2590df5c1e66f76eb103487e9d6392dcab3a7c64	tree \| snapshot
parent	a9bca4aa722a23d648e622da8a83f5ab3a943531	commit \| diff
parent	d686990a3c4bf23823d78c9b69196b24028491ee	commit \| diff

Merge branch 'master' into gfio

Conflicts:
eta.c
fio.h
init.c
options.c
stat.c

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

17 files changed:

HOWTO	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
cconv.c	diff1 \|	\|	blob \| history
client.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
engines/net.c	diff1 \|	diff2 \|	blob \| history
eta.c	diff1 \|	diff2 \|	blob \| history
filesetup.c	diff1 \|	diff2 \|	blob \| history
fio.1	diff1 \|	diff2 \|	blob \| history
fio.h	diff1 \|	diff2 \|	blob \| history
init.c	diff1 \|	diff2 \|	blob \| history
ioengine.h	diff1 \|	diff2 \|	blob \| history
options.c	diff1 \|	diff2 \|	blob \| history
server.c	diff1 \|	diff2 \|	blob \| history
stat.c	diff1 \|	diff2 \|	blob \| history
stat.h	diff1 \|	diff2 \|	blob \| history
thread_options.h	diff1 \|	\|	blob \| history

fio - Flexible IO Tester