]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb36957 fd2f455)
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)
Do not ignore standby_for_fscid when selecting a standby.

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

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/mds/FSMap.cc patch | diff1 | diff2 | blob | history
src/mds/FSMap.h patch | diff1 | diff2 | blob | history

diff --cc src/mds/FSMap.cc
Simple merge
diff --cc src/mds/FSMap.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.