From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 10 Apr 2013 17:50:32 +0000 (+0200)
Subject: Merge branch 'master' into gfio
X-Git-Tag: fio-2.1~57^2~1
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=b7f487cf80a8299a656df9c2214ff73e72956d71

Merge branch 'master' into gfio

Conflicts:
	engines/libaio.c
	engines/net.c
	iolog.h
	options.c
	options.h
	parse.c
	parse.h
	thread_options.h

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

b7f487cf80a8299a656df9c2214ff73e72956d71
diff --cc thread_options.h
index a7949497,d64423fe..68056dfb
--- a/thread_options.h
+++ b/thread_options.h
@@@ -123,8 -125,8 +123,9 @@@ struct thread_options 
  	unsigned int fsync_on_close;
  
  	unsigned int random_distribution;
 -	double zipf_theta;
 -	double pareto_h;
++
 +	fio_fp64_t zipf_theta;
 +	fio_fp64_t pareto_h;
  
  	unsigned int random_generator;