]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge pull request #15130 from ukernel/wip-19946
authorJohn Spray <jspray@redhat.com>
Wed, 24 May 2017 15:49:42 +0000 (16:49 +0100)
committerGitHub <noreply@github.com>
Wed, 24 May 2017 15:49:42 +0000 (16:49 +0100)
commit0f0fdeb18e4bd197cb75c39ca4f43f8681f2ff9e
tree56ea748cbe85d4da886658faf610094d03e5aca9
parentef9d555916e16602c75a52c7a75b7fdc5f635502
parent2c537ee796ee5cb2aac88f3a2e75c3b22cd6c5c1
Merge pull request #15130 from ukernel/wip-19946

mds: fix CDir::merge() for mds_debug_auth_pins

Reviewed-by: John Spray <john.spray@redhat.com>
src/mds/CDir.cc
src/mds/MDCache.cc