]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 710cf45 ed7fc53)
Merge PR #18366 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 24 Oct 2017 19:17:19 +0000 (12:17 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 24 Oct 2017 19:17:19 +0000 (12:17 -0700)
* refs/pull/18366/head:
mon: s/mds_blacklist_interval/mon_mds_blacklist_interval/
mon: tidy up mds_blacklist_interval

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/common/legacy_config_opts.h patch | diff1 | diff2 | blob | history
src/common/options.cc patch | diff1 | diff2 | blob | history

diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.