]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb7786b bdb2fa2)
Merge pull request #5966 from ukernel/wip-12506
authorGregory Farnum <greg@gregs42.com>
Mon, 21 Sep 2015 22:50:28 +0000 (15:50 -0700)
committerGregory Farnum <greg@gregs42.com>
Mon, 21 Sep 2015 22:50:28 +0000 (15:50 -0700)
Wip 12506

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

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