Ceph » CephFS

Some files are missing in luminous branch, e.g src/mds/OpenFileTable.cc

$ git status
On branch wip-25046-luminous
Your branch is up-to-date with 'upstream/luminous'.
You are currently cherry-picking commit 0f735f4031.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

modified:   src/mds/Beacon.cc
    modified:   src/mds/CDir.cc
    modified:   src/mds/CInode.cc
    modified:   src/mds/MDCache.cc
    modified:   src/mds/MDLog.cc
    modified:   src/mds/MDSContext.cc
    modified:   src/mds/MDSContext.h
    modified:   src/mds/MDSRank.cc
    modified:   src/mds/MDSTable.cc
    modified:   src/mds/MDSTable.h
    modified:   src/mds/RecoveryQueue.cc
    modified:   src/mds/SessionMap.cc
    modified:   src/mds/StrayManager.cc
    modified:   src/messages/MMDSBeacon.h

Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)

deleted by us:   src/mds/OpenFileTable.cc

Need inputs.