Merge branch 'next'

diff --cc suites/upgrade/fs/tasks/upgrade_mds_first_fsx_ffsb.sh
index 619e270daadda73d4791c4ccfcc0d08f9f7080be,0000000000000000000000000000000000000000..7872f68a05ea7893ccdf073a525b48e7a1792721
mode 100644,000000..100644
--- 1/suites/upgrade/fs/tasks/upgrade_mds_first_fsx_ffsb.sh
--- /dev/null
+++ b/suites/upgrade/fs/tasks/upgrade_mds_first_fsx_ffsb.sh
@@@ -1,26 -1,0 +1,29 @@@
 +roles:
 +- - mon.a
 +  - mds.a
 +  - osd.0
 +  - osd.1
 +- - mon.b
 +  - mon.c
 +  - osd.2
 +  - osd.3
 +- - client.0
 +tasks:
 +- install:
 +     branch: bobtail
 +- ceph:
++    conf:
++      osd:
++        filestore flush min: 0
 +- workunit:
 +     clients:
 +        all:
 +           - suites/fsx.sh
 +- install.upgrade:
 +     all:
 +        branch: next
 +- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c]
 +- workunit:
 +     clients:
 +        all:
 +           - suites/ffsb.sh