]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: febcc06 9588efe)
Merge branch 'wip-14374' of git://github.com/jcsp/ceph into greg-fs-testing
authorGreg Farnum <gfarnum@redhat.com>
Tue, 26 Jan 2016 19:14:04 +0000 (11:14 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Tue, 26 Jan 2016 19:14:04 +0000 (11:14 -0800)
commit0ec5adcdcfce5ef675be0fa88c3806dd27a8deb7
treebe61e57894503bfbb4abd6d944d2877a9160c615tree | snapshot
parentfebcc065c2cd273e2a4ed91edc1d6512c9c503a1commit | diff
parent9588efe2bb72c320c1567d5e69147bb01f2fb431commit | diff
Merge branch 'wip-14374' of git://github.com/jcsp/ceph into greg-fs-testing

https://github.com/ceph/ceph/pull/7295

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Conflicts:
src/mds/MDSDaemon.cc

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
src/mds/MDSDaemon.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.