Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Wed, 20 Feb 2013 10:52:28 +0000 (11:52 +0100)
committerJens Axboe <axboe@kernel.dk>
Wed, 20 Feb 2013 10:52:28 +0000 (11:52 +0100)
Conflicts:
configure
fio.c
init.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
1  2 
Makefile
backend.c
configure
init.c
iolog.c

diff --cc Makefile
Simple merge
diff --cc backend.c
Simple merge
diff --cc configure
Simple merge
diff --cc init.c
--- 1/init.c
--- 2/init.c
+++ b/init.c
@@@ -40,7 -40,8 +40,7 @@@ struct thread_data *threads = NULL
  
  int exitall_on_terminate = 0;
  int output_format = FIO_OUTPUT_NORMAL;
- int eta_print;
+ int eta_print = FIO_ETA_AUTO;
 -unsigned long long mlock_size = 0;
  FILE *f_out = NULL;
  FILE *f_err = NULL;
  char **job_sections = NULL;
diff --cc iolog.c
Simple merge