From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 18 Jul 2017 05:33:40 +0000 (-0700)
Subject: Merge PR 16039 into master
X-Git-Tag: ses5-milestone9~1^2~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc58d6aa92dcb5b99f2522cd5d10a3b62fdc23be;p=ceph.git

Merge PR 16039 into master

* refs/remotes/upstream/pull/16039/head:
	common/config_opts: drop unused opt(mds_kill_journal_at)

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

bc58d6aa92dcb5b99f2522cd5d10a3b62fdc23be