Merge branch 'fsck-timeout' into nextnext
commit3204f2ccee694505027222dbfedf85557239c4c0
authorEric Wong <e@80x24.org>
Mon, 18 Sep 2017 21:48:42 +0000 (18 21:48 +0000)
committerEric Wong <e@80x24.org>
Mon, 18 Sep 2017 21:48:42 +0000 (18 21:48 +0000)
tree24b28d595f03530e4db60353fa8c171bd9be5f63
parent591b6d2bb557d802e726b105631299c552a79915
parent2c50b8b0cbe48fcba064ca2b687e01c11c7b2601
Merge branch 'fsck-timeout' into next

* fsck-timeout:
  fsck: avoid infinite wait on dead devices
lib/MogileFS/Worker/Fsck.pm