Bruce Cran (1):
      Fix Windows build by using lib/strcasestr.{c,h}

Jason Dillaman (1):
      engines/rbd: potential re-use of active fio_rbd_iou

Jens Axboe (26):
      Merge branch 'patch-1' of git://github.com/Tfindelkind/fio
      Fix integer overflow in rate_iops
      sg: fix short reads
      server: bump protocol version
      verify: add faster 'memory is all zeroes' helper
      strlcat: fix header guard typo
      client: remove duplicated code
      Add support for multiple output formats
      Enable the use of multiple output formats
      Update fio man page
      Re-instate --append-terse
      Proper size return from output buffers
      Don't setup output buffers we are not going to use
      jobs_eta alloc padding
      log: abstract out and use generic buffer logger
      Unbreak output buffer logging over the network
      stat: collapse buf output flush and free
      stat: fix potential segfault for json output on network client
      client/backend: fix incomplete output_format checks
      Fixup -Wshadow warnings
      Merge branch 'mmap_shared' of git://github.com/lsgunth/fio
      Fixup bw/iops logging for short runs
      Update documentation for mmapshared (MMAP_SHARED)
      Bump the client ETA timeout from 5s to 30s
      output_buffer: only realloc once, and memset just what we need
      Fio 2.2.11

Kris Davis (2):
      sg: 16-byte cdb support and lots of fixes
      Use line buffering on stdout

Logan Gunthorpe (1):
      Add mmapshared option to use mmaped files with the MAP_SHARED flag.

Roman Pen (2):
      fio.1,HOWTO: keep 'iodepth_batch' option in sync
      Introduce new option: iodepth_batch_complete_max

Stephen Bates (1):
      Reduced minimum for option log_gz

Tfindelkind (1):
      Update fio2gnuplot

Thomas Findelkind (1):
      Update fio2gnuplot