From: Greg Farnum <gfarnum@redhat.com>
Date: Fri, 25 Mar 2016 00:55:56 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/wip-15065'
X-Git-Tag: v10.1.1~114
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ee6f064521fc5974d88851bf1885a1b199d725f9;p=ceph.git

Merge remote-tracking branch 'origin/wip-15065'

Support new standby_for_fscid option, letting us assign daemons to FS clusters.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

ee6f064521fc5974d88851bf1885a1b199d725f9