]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR 16039 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Jul 2017 05:33:40 +0000 (22:33 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Jul 2017 05:33:40 +0000 (22:33 -0700)
* refs/remotes/upstream/pull/16039/head:
common/config_opts: drop unused opt(mds_kill_journal_at)

Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/common/config_opts.h

Simple merge