Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Wed, 10 Apr 2013 17:50:32 +0000 (19:50 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 10 Apr 2013 17:50:32 +0000 (19:50 +0200)
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>
1  2 
HOWTO
engines/libaio.c
engines/net.c
fio.1
iolog.h
options.c
options.h
parse.c
thread_options.h

diff --cc HOWTO
Simple merge
Simple merge
diff --cc engines/net.c
Simple merge
diff --cc fio.1
Simple merge
diff --cc iolog.h
Simple merge
diff --cc options.c
Simple merge
diff --cc options.h
Simple merge
diff --cc parse.c
Simple merge
@@@ -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;