]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/pull/15818/head' into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 04:37:45 +0000 (21:37 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 04:37:45 +0000 (21:37 -0700)
* upstream/pull/15818/head:
  mds: assert straydn to silence coverity error

Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/mds/Server.cc

Simple merge