]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #25741 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 8 Jan 2019 15:03:40 +0000 (07:03 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 8 Jan 2019 15:03:40 +0000 (07:03 -0800)
* refs/pull/25741/head:
mds: remove wrong assertion in Locker::snapflush_nudge

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Trivial merge