From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 7 Jul 2017 04:37:45 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/pull/15818/head' into master
X-Git-Tag: v12.1.1~151
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b72ac6e8572bcf68c10bd813688982f939989ca2;p=ceph.git

Merge remote-tracking branch 'upstream/pull/15818/head' into master

* upstream/pull/15818/head:
  mds: assert straydn to silence coverity error

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

b72ac6e8572bcf68c10bd813688982f939989ca2