From: Sage Weil <sage@inktank.com>
Date: Tue, 23 Apr 2013 03:59:43 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.94.10~27^2^2~752
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa16700d1281a3398b752d5277f9596ad565915a;p=ceph.git

Merge branch 'next'
---

aa16700d1281a3398b752d5277f9596ad565915a
diff --cc suites/upgrade/fs/tasks/upgrade_mds_first_fsx_ffsb.sh
index 619e270daad,00000000000..7872f68a05e
mode 100644,000000..100644
--- a/suites/upgrade/fs/tasks/upgrade_mds_first_fsx_ffsb.sh
+++ 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