]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'jewel-15402' of git://github.com/ukernel/ceph into greg-fs-testing
authorGreg Farnum <gfarnum@redhat.com>
Mon, 11 Apr 2016 21:13:07 +0000 (14:13 -0700)
committerGreg Farnum <gfarnum@redhat.com>
Mon, 11 Apr 2016 21:13:07 +0000 (14:13 -0700)
commitb922788841e3a59abf732d072b45a53caa18ec8d
tree0f63b7208572183e981ebd1d7533765f914756ee
parenteb3695734664d1eef0e6125c4c27dadfa7089996
parentfd2f4555f9bbbfbed4450dddce807e2f80c65eea
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>
src/mds/FSMap.cc
src/mds/FSMap.h