From: Greg Farnum <gfarnum@redhat.com>
Date: Mon, 11 Apr 2016 21:13:07 +0000 (-0700)
Subject: Merge branch 'jewel-15402' of git://github.com/ukernel/ceph into greg-fs-testing
X-Git-Tag: v10.1.2~3^2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b922788841e3a59abf732d072b45a53caa18ec8d;p=ceph.git

Merge branch 'jewel-15402' of git://github.com/ukernel/ceph into greg-fs-testing

Do not ignore standby_for_fscid when selecting a standby.

https://github.com/ceph/ceph/pull/8536

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

b922788841e3a59abf732d072b45a53caa18ec8d