]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fb4782 6c1543d)
Merge PR #18646 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 3 Nov 2017 21:35:07 +0000 (14:35 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 3 Nov 2017 21:35:07 +0000 (14:35 -0700)
* refs/pull/18646/head:
mds: fix MDS_FEATURE_INCOMPAT_FILE_LAYOUT_V2 definition
mds: remove useless incompat feature definination in FSMap.h

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/FSMap.h patch | diff1 | diff2 | blob | history
src/mds/MDSMap.h patch | diff1 | diff2 | blob | history

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