]> 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: 858059e 994ec60)
Merge branch 'wip-13256' of git://github.com/ukernel/ceph into infernalis
authorGreg Farnum <gfarnum@redhat.com>
Wed, 7 Oct 2015 17:45:36 +0000 (10:45 -0700)
committerGreg Farnum <gfarnum@redhat.com>
Wed, 7 Oct 2015 17:45:36 +0000 (10:45 -0700)
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/mds/Server.cc patch | diff1 | diff2 | blob | history

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