]>
git.apps.os.sepia.ceph.com Git - ceph-ci.git/log 
Lenz Grimmer  [Wed, 17 Oct 2018 10:56:21 +0000  (12:56 +0200)] 
Merge pull request #24631 from Devp00l/wip-issue-36466Reviewed-by: Ricardo Marques <rimarques@suse.com> Reviewed-by: Tiago Melo <tmelo@suse.com> 
Stephan Müller  [Mon, 8 Oct 2018 15:07:11 +0000  (17:07 +0200)] 
mgr/dashboard: Add left padding to helper iconFixes: https://tracker.ceph.com/issues/36466 Signed-off-by: Stephan Müller <smueller@suse.com> 
Sage Weil  [Tue, 16 Oct 2018 22:57:24 +0000  (17:57 -0500)] 
Merge PR #24578 into masterReviewed-by: Brad Hubbard <bhubbard@redhat.com> Reviewed-by: Neha Ojha <nojha@redhat.com> 
Sage Weil  [Tue, 16 Oct 2018 22:56:59 +0000  (17:56 -0500)] 
Merge PR #24565 into masterReviewed-by: John Spray <john.spray@redhat.com> Reviewed-by: Sebastian Wagner <swagner@suse.com> 
Sage Weil  [Tue, 16 Oct 2018 22:56:43 +0000  (17:56 -0500)] 
Merge PR #24558 into masterReviewed-by: Noah Watkins <nwatkins@redhat.com> 
Sage Weil  [Tue, 16 Oct 2018 22:55:59 +0000  (17:55 -0500)] 
Merge PR #24528 into masterReviewed-by: Casey Bodley <cbodley@redhat.com> Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com> 
Sage Weil  [Tue, 16 Oct 2018 22:43:02 +0000  (17:43 -0500)] 
Merge PR #24151 into masterReviewed-by: John Spray <john.spray@redhat.com> 
Sage Weil  [Tue, 16 Oct 2018 19:34:19 +0000  (14:34 -0500)] 
Merge PR #24566 into masterReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Sage Weil  [Tue, 16 Oct 2018 18:41:28 +0000  (13:41 -0500)] 
Merge PR #24598 into masterReviewed-by: Erwan Velu <erwan@redhat.com> Reviewed-by: Piotr Dałek <piotr.dalek@corp.ovh.com> Reviewed-by: Lenz Grimmer <lgrimmer@suse.com> Reviewed-by: John Spray <john.spray@redhat.com> Reviewed-by: Jason Dillaman <dillaman@redhat.com> Reviewed-by: Neha Ojha <nojha@redhat.com> Reviewed-by: Gregory Farnum <gfarnum@redhat.com> 
Kefu Chai  [Tue, 16 Oct 2018 16:45:19 +0000  (00:45  +0800)] 
Merge pull request #24619 from tchaikov/wip-crimson-mon-client-better-encapsulationReviewed-by: Casey Bodley <cbodley@redhat.com> 
Kefu Chai  [Tue, 16 Oct 2018 15:24:05 +0000  (23:24 +0800)] 
crimson/mon: move mon::Connection into .ccSigned-off-by: Kefu Chai <kchai@redhat.com> 
Neha Ojha  [Tue, 16 Oct 2018 15:10:36 +0000  (08:10 -0700)] 
Merge pull request #23849 from tchaikov/wip-crimson-moncReviewed-by: Casey Bodley <cbodley@redhat.com> 
Patrick Donnelly  [Tue, 16 Oct 2018 14:52:54 +0000  (07:52 -0700)] 
Merge PR #24505 into masterReviewed-by: Zheng Yan <zyan@redhat.com> 
Kefu Chai  [Tue, 16 Oct 2018 14:12:53 +0000  (22:12 +0800)] 
Merge pull request #24373 from mogeb/build-cls-rbdReviewed-by: Casey Bodley <cbodley@redhat.com> Reviewed-by: Mykola Golub <mgolub@suse.com> 
Patrick Donnelly  [Tue, 9 Oct 2018 22:50:22 +0000  (15:50 -0700)] 
mds: wait shorter intervals if beacon not sentSigned-off-by: Patrick Donnelly <pdonnell@redhat.com> 
Sage Weil  [Tue, 16 Oct 2018 12:20:17 +0000  (07:20 -0500)] 
Merge PR #24095 into masterReviewed-by: Ricardo Dias <rdias@suse.com> 
Sage Weil  [Tue, 16 Oct 2018 12:17:59 +0000  (07:17 -0500)] 
Merge PR #24579 into masterReviewed-by: John Spray <john.spray@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> Reviewed-by: Sage Weil <sage@redhat.com> 
John Spray  [Tue, 16 Oct 2018 12:09:08 +0000  (13:09 +0100)] 
Merge pull request #24597 from batrick/i36450Reviewed-by: Kefu Chai <kchai@redhat.com> Reviewed-by: John Spray <john.spray@redhat.com> Reviewed-by: Lenz Grimmer <lgrimmer@suse.com> 
Kefu Chai  [Tue, 16 Oct 2018 11:15:35 +0000  (19:15 +0800)] 
Merge pull request #23983 from theanalyst/vstart-rgw-asokReviewed-by: Casey Bodley <cbodley@redhat.com> 
Kefu Chai  [Tue, 16 Oct 2018 08:44:16 +0000  (16:44 +0800)] 
Merge pull request #24576 from cyx1231st/wip-seastar-msgr-refactorReviewed-by: Casey Bodley <cbodley@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Tue, 16 Oct 2018 05:49:19 +0000  (13:49 +0800)] 
Merge pull request #24255 from gregsfortytwo/wip-crush-docReviewed-by: Brad Hubbard <bhubbard@redhat.com> 
Patrick Donnelly  [Tue, 16 Oct 2018 04:34:31 +0000  (21:34 -0700)] 
Merge PR #24286 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 16 Oct 2018 04:31:04 +0000  (21:31 -0700)] 
Merge PR #24292 into masterReviewed-by: Zheng Yan <zyan@redhat.com> 
Patrick Donnelly  [Tue, 16 Oct 2018 04:23:19 +0000  (21:23 -0700)] 
Merge PR #24486 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 16 Oct 2018 04:12:56 +0000  (21:12 -0700)] 
Merge PR #24508 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Sage Weil  [Mon, 15 Oct 2018 23:41:53 +0000  (18:41 -0500)] 
Merge PR #24596 into masterReviewed-by: Sage Weil <sage@redhat.com> Reviewed-by: Neha Ojha <nojha@redhat.com> 
Sage Weil  [Mon, 15 Oct 2018 22:36:43 +0000  (17:36 -0500)] 
.github/stale.yml: configure probot/stale to automatically close stale issuesSigned-off-by: Sage Weil <sage@redhat.com> 
Patrick Donnelly  [Mon, 15 Oct 2018 21:44:45 +0000  (14:44 -0700)] 
qa: fix run call argsFixes: http://tracker.ceph.com/issues/36450 Introduced-by: 95746ecce9215c8428a02f1745d03e10536a4129 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Mon, 15 Oct 2018 21:34:21 +0000  (14:34 -0700)] 
Merge PR #24562 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Gregory Farnum  [Mon, 15 Oct 2018 21:17:36 +0000  (14:17 -0700)] 
Merge pull request #24186 from libingyang-zte/master
Gregory Farnum  [Mon, 15 Oct 2018 21:15:43 +0000  (14:15 -0700)] 
Merge pull request #24238 from LenzGr/doc-leads-update
Yingxin  [Mon, 15 Oct 2018 09:46:55 +0000  (17:46 +0800)] 
crimson/net: clean seastar-msgr class dependenciesSigned-off-by: Yingxin <yingxin.cheng@intel.com> 
Sage Weil  [Mon, 15 Oct 2018 12:35:24 +0000  (07:35 -0500)] 
osd: do not authenticate heartbeat connections until nautilus
Some (currently) pre-nautilus OSDs will crash if you try to authenticate
a heartbeat connection but they are not expecting it:
src/auth/Crypto.h: 109: FAILED assert(ckh)
 ceph version 
12.2.8-457-gccd69ef  (
ccd69ef36aafebab964a2e47e249fdb95e083e46 ) luminous (stable)
 1: (ceph::__ceph_assert_fail(char const*, char const*, int, char const*)+0x110) [0x5618b04aaea0]
 2: (()+0x41cbec) [0x5618afe2cbec]
 3: (CephxSessionHandler::_calc_signature(Message*, unsigned long*)+0x8c5) [0x5618b0777ba5]
 4: (CephxSessionHandler::check_message_signature(Message*)+0x7d) [0x5618b077800d]
 5: (AsyncConnection::process()+0x1b44) [0x5618b0761a04]
 6: (EventCenter::process_events(int, std::chrono::duration<unsigned long, std::ratio<1l, 1000000000l> >*)+0x359) [0x5618b0546079]
 7: (()+0xb38c3e) [0x5618b0548c3e]
 8: (()+0xb5070) [0x7ff04faf5070]
 9: (()+0x7dd5) [0x7ff050168dd5]
 10: (clone()+0x6d) [0x7ff04f259b3d]
See http://tracker.ceph.com/issues/36443
It won't be fixed in all clusters before upgrade to nautilus, though, so
we also need to work around it here.
Signed-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Wed, 19 Sep 2018 16:44:32 +0000  (11:44 -0500)] 
msg,osd: enable unauthenticated Dispatcher for pre-nautilus OSD compatSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 11 Oct 2018 19:28:58 +0000  (14:28 -0500)] 
osd: add missing space in heartbeat debug outputSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Fri, 21 Sep 2018 14:10:22 +0000  (09:10 -0500)] 
mgr/DaemonServer: add missing returnFixes: http://tracker.ceph.com/issues/36110 Signed-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 20 Sep 2018 21:19:15 +0000  (16:19 -0500)] 
msg/async: drop verify_authorizer wrapperSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Wed, 19 Sep 2018 16:35:42 +0000  (11:35 -0500)] 
osd: authenticate ping sessionsSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Wed, 19 Sep 2018 15:52:45 +0000  (10:52 -0500)] 
msg/simple: remove verify_authorizer wrapperSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 13 Sep 2018 19:38:21 +0000  (14:38 -0500)] 
msg: remove unused ms_verify_authorizerSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 13 Sep 2018 19:32:42 +0000  (14:32 -0500)] 
msg/async: remove get_authorizer wrapperSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 13 Sep 2018 19:29:59 +0000  (14:29 -0500)] 
msg/simple: remove get_authorizer wrapperSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 13 Sep 2018 19:21:04 +0000  (14:21 -0500)] 
msg/Messenger: pull authenticator validation into MessengerSigned-off-by: Sage Weil <sage@redhat.com> 
huanwen ren  [Mon, 15 Oct 2018 17:47:07 +0000  (01:47  +0800)] 
qa/osd: fixup osd-rep-recov-eio.sh fails to parse pg dumpFixes: http://tracker.ceph.com/issues/36418 Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn> 
Lenz Grimmer  [Mon, 15 Oct 2018 16:01:41 +0000  (18:01 +0200)] 
Merge pull request #24577 from p-na/fix-saves-invalid-configReviewed-by: Ricardo Marques <rimarques@suse.com> Reviewed-by: Tatjana Dehler <tdehler@suse.com> 
Sage Weil  [Mon, 15 Oct 2018 15:26:31 +0000  (10:26 -0500)] 
common/condition_variable_debug: fix wait hooksSigned-off-by: Sage Weil <sage@redhat.com> 
Scoots Hamilton  [Mon, 15 Oct 2018 15:18:43 +0000  (11:18 -0400)] 
removed warning for resolved errataSigned-off-by: Scoots Hamilton <scoots@redhat.com> 
Sage Weil  [Fri, 12 Oct 2018 21:34:59 +0000  (16:34 -0500)] 
mgr/devicehealth: use is_valid_daemon_name helperSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 18 Sep 2018 21:48:48 +0000  (16:48 -0500)] 
mgr/devicehealth: generalize to mon and osd daemonsSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 18 Sep 2018 21:47:56 +0000  (16:47 -0500)] 
mon: implement 'smart [devid]' tell commandSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 18 Sep 2018 19:09:28 +0000  (14:09 -0500)] 
mgr: parse mon metadata properlySigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 18 Sep 2018 19:08:41 +0000  (14:08 -0500)] 
mon: report device id used by monSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 18 Sep 2018 19:29:21 +0000  (14:29 -0500)] 
common/blkdev: add get_device_by_pathSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 18 Sep 2018 19:20:10 +0000  (14:20 -0500)] 
common/blkdev: migrate block_device_run_smartctl from OSD.ccSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Mon, 15 Oct 2018 13:56:17 +0000  (08:56 -0500)] 
common/mutex_debug: remove no-op before/after hooksSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Mon, 15 Oct 2018 13:55:39 +0000  (08:55 -0500)] 
common/mutex_debug: do lockdep post-lock step in callerSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Mon, 15 Oct 2018 13:42:50 +0000  (08:42 -0500)] 
Merge PR #24473 into masterReviewed-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Mon, 15 Oct 2018 13:36:18 +0000  (08:36 -0500)] 
Merge PR #24493 into masterReviewed-by: John Spray <john.spray@redhat.com> 
Lenz Grimmer  [Mon, 15 Oct 2018 13:14:52 +0000  (15:14 +0200)] 
Merge pull request #24523 from s0nea/wip-dashboard-configs-table-cleanupReviewed-by: Ricardo Marques <rimarques@suse.com> Reviewed-by: Tiago Melo <tmelo@suse.com> 
Tatjana Dehler  [Wed, 10 Oct 2018 14:12:32 +0000  (16:12 +0200)] 
mgr/dashboard: config options table cleanupFixes: http://tracker.ceph.com/issues/34533 Signed-off-by: Tatjana Dehler <tdehler@suse.com> 
Kefu Chai  [Mon, 15 Oct 2018 08:55:17 +0000  (16:55 +0800)] 
pybind/ceph_argparse.py: do not create file for validating CephFilepathSigned-off-by: Kefu Chai <kchai@redhat.com> 
John Spray  [Mon, 15 Oct 2018 08:23:39 +0000  (09:23 +0100)] 
Merge pull request #24560 from sebastian-philipp/orchestrator-fix-rook-cluster-in-nameReviewed-by: John Spray <john.spray@redhat.com> 
Patrick Nawracay  [Sat, 13 Oct 2018 20:58:36 +0000  (22:58 +0200)] 
mgr/dashboard: Save button doesn't prevent saving an invalid formFixes: http://tracker.ceph.com/issues/36426 Signed-off-by: Patrick Nawracay <pnawracay@suse.com> 
Sage Weil  [Sun, 14 Oct 2018 18:11:11 +0000  (13:11 -0500)] 
Merge PR #24494 into masterReviewed-by: Neha Ojha <nojha@redhat.com> 
Sage Weil  [Wed, 10 Oct 2018 17:58:33 +0000  (12:58 -0500)] 
os/bluestore: {Mutex,Cond} -> ceph::{mutex,condition_variable}Signed-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Wed, 10 Oct 2018 17:38:06 +0000  (12:38 -0500)] 
os/bluestore: std::recursive_mutex -> ceph::recursive_mutexSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Wed, 10 Oct 2018 17:57:41 +0000  (12:57 -0500)] 
os/bluestore: re-add is_locked assertSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Wed, 10 Oct 2018 17:37:46 +0000  (12:37 -0500)] 
os/bluestore: std::{mutex,condition_variable} -> ceph::{mutex,condition_variable}Signed-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 13 Sep 2018 19:14:43 +0000  (14:14 -0500)] 
msg/Messenger: uninline ms_deliver_verify_authorizerSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 13 Sep 2018 19:27:49 +0000  (14:27 -0500)] 
mgr/DaemonServer: expose keyring for authenticator verificationSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 13 Sep 2018 19:05:08 +0000  (14:05 -0500)] 
mon: expose keyring for msgr1 authenticationSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 13 Sep 2018 19:03:21 +0000  (14:03 -0500)] 
mds: expose keyring for authenticater verificationSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 13 Sep 2018 19:02:57 +0000  (14:02 -0500)] 
osd: expose keyring for authenticater verificationSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 13 Sep 2018 19:02:34 +0000  (14:02 -0500)] 
msg/Dispatcher: add ms_get_auth1_authorizer_keystoreSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 13 Sep 2018 19:00:44 +0000  (14:00 -0500)] 
mon: fix ref cycle breakage in handle_forwardSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 9 Oct 2018 22:08:46 +0000  (17:08 -0500)] 
mon: use MonOpRequest get_session() instead of PaxosServiceMessage'sSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 13 Sep 2018 18:59:25 +0000  (13:59 -0500)] 
mon: get session from MonOpRequest in handle_commandSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 9 Oct 2018 22:08:56 +0000  (17:08 -0500)] 
messages/MForward: drop unused ctorSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 11 Sep 2018 21:53:15 +0000  (16:53 -0500)] 
mon: use ms_handle_authentication to parse capsSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 11 Sep 2018 21:30:27 +0000  (16:30 -0500)] 
mon: kill Session::global_id and use Connection member insteadSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 13 Sep 2018 21:54:08 +0000  (16:54 -0500)] 
mgr/DaemonServer: move session setup into ms_handle_authenticationSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 11 Sep 2018 19:38:05 +0000  (14:38 -0500)] 
mds: move session setup into ms_handle_authenticationSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 11 Sep 2018 19:07:16 +0000  (14:07 -0500)] 
osd: move session setup into ms_handle_authenticationSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Wed, 15 Jun 2016 15:40:34 +0000  (11:40 -0400)] 
msg: new ms_handle_authentication, add fields to ConnectionSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Sun, 14 Oct 2018 16:42:17 +0000  (11:42 -0500)] 
Merge PR #24146 into masterReviewed-by: John Spray <john.spray@redhat.com> 
Sage Weil  [Tue, 9 Oct 2018 14:13:41 +0000  (09:13 -0500)] 
ceph-kvstore-tool: rename repair -> destructive-repairSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Sun, 14 Oct 2018 16:40:15 +0000  (11:40 -0500)] 
Merge PR #24247 into masterReviewed-by: Neha Ojha <nojha@redhat.com> Reviewed-by: Josh Durgin <jdurgin@redhat.com> Reviewed-by: Greg Farnum <gfarnum@redhat.com> 
Sage Weil  [Sun, 14 Oct 2018 13:06:18 +0000  (08:06 -0500)] 
Merge PR #24495 into masterReviewed-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Sun, 14 Oct 2018 13:05:10 +0000  (08:05 -0500)] 
Merge PR #24535 into masterReviewed-by: Jason Dillaman <dillaman@redhat.com> Reviewed-by: Sage Weil <sage@redhat.com> 
Mykola Golub  [Sun, 14 Oct 2018 07:40:05 +0000  (10:40 +0300)] 
Merge pull request #24563 from dillaman/wip-36410Reviewed-by: Mykola Golub <mgolub@suse.com> 
Noah Watkins  [Sat, 13 Oct 2018 16:05:06 +0000  (09:05 -0700)] 
mgr: python 3 compat fixesSigned-off-by: Noah Watkins <noahwatkins@gmail.com> 
Neha Ojha  [Sat, 13 Oct 2018 02:15:39 +0000  (19:15 -0700)] 
Merge pull request #24564 from neha-ojha/wip-21931Reviewed-by: Sage Weil <sage@redhat.com> Reviewed-by: Josh Durgin <jdurgin@redhat.com> 
Sage Weil  [Wed, 10 Oct 2018 16:04:09 +0000  (11:04 -0500)] 
os/bluestore: use deduction for lock_guard<>, unique_lock<>Signed-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Fri, 12 Oct 2018 21:29:44 +0000  (16:29 -0500)] 
Merge PR #24204 into masterReviewed-by: Casey Bodley <cbodley@redhat.com> Reviewed-by: Yuri Weinstein <yweins@redhat.com> 
Sage Weil  [Fri, 12 Oct 2018 21:29:28 +0000  (16:29 -0500)] 
Merge PR #24249 into masterReviewed-by: Kefu Chai <kchai@redhat.com> 
Sage Weil  [Fri, 12 Oct 2018 21:10:45 +0000  (16:10 -0500)] 
osd,mon: keep last_epoch_started along with last_epoch_clean premergeSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Fri, 12 Oct 2018 21:16:39 +0000  (16:16 -0500)] 
Merge PR #24296 into masterReviewed-by: Jianpeng Ma <jianpeng.ma@intel.com> Reviewed-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Fri, 12 Oct 2018 21:14:55 +0000  (16:14 -0500)] 
Merge PR #24131 into masterReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Sage Weil  [Fri, 12 Oct 2018 21:14:37 +0000  (16:14 -0500)] 
Merge PR #24270 into masterReviewed-by: Gregory Farnum <gfarnum@redhat.com> Reviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Sage Weil  [Fri, 12 Oct 2018 21:14:19 +0000  (16:14 -0500)] 
Merge PR #24312 into masterReviewed-by: xie xingguo <xie.xingguo@zte.com.cn> Reviewed-by: Josh Durgin <jdurgin@redhat.com> Reviewed-by: Sage Weil <sage@redhat.com>