]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #8970 from Abhishekvrshny/wip-15732-jewel
authorGregory Farnum <greg@gregs42.com>
Wed, 11 May 2016 19:23:28 +0000 (12:23 -0700)
committerGregory Farnum <greg@gregs42.com>
Wed, 11 May 2016 19:23:28 +0000 (12:23 -0700)
jewel: MDS incarnation no longer gets lost after remove filesystem

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/mds/FSMap.cc
src/mds/MDSMap.cc
src/mds/MDSMap.h
src/mds/MDSRank.cc
src/mon/MDSMonitor.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge