From: John Spray <jspray@redhat.com>
Date: Wed, 24 May 2017 15:49:42 +0000 (+0100)
Subject: Merge pull request #15130 from ukernel/wip-19946
X-Git-Tag: v12.1.1~65^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f0fdeb18e4bd197cb75c39ca4f43f8681f2ff9e;p=ceph.git

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>
---

0f0fdeb18e4bd197cb75c39ca4f43f8681f2ff9e