]>
git.apps.os.sepia.ceph.com Git - ceph-ci.git/log 
Sage Weil  [Fri, 18 May 2018 14:18:11 +0000  (09:18 -0500)] 
os/bluestore: fix flush_commit lockingFixes: http://tracker.ceph.com/issues/21480 Signed-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 15 May 2018 21:15:05 +0000  (16:15 -0500)] 
Merge pull request #21932 from yuriw/wip-yuriw-add-dollar-rgwReviewed-by: Casey Bodley <cbodley@redhat.com> 
Sage Weil  [Tue, 15 May 2018 19:42:24 +0000  (14:42 -0500)] 
Merge pull request #22011 from dillaman/wip-rbd-release-notes
Patrick Donnelly  [Tue, 15 May 2018 17:47:21 +0000  (10:47 -0700)] 
Merge PR #22017 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 15 May 2018 17:45:20 +0000  (10:45 -0700)] 
ptl-tool: skip empty comment bodySigned-off-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 15 May 2018 17:10:03 +0000  (10:10 -0700)] 
Merge PR #21924 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Sage Weil  [Tue, 15 May 2018 16:25:09 +0000  (11:25 -0500)] 
Merge pull request #22016 from LenzGr/dashboard-mimic-reasenotes
Lenz Grimmer  [Tue, 15 May 2018 16:14:47 +0000  (18:14 +0200)] 
doc/releases/mimic: Updated dashboard descriptionSigned-off-by: Lenz Grimmer <lgrimmer@suse.com> 
Jason Dillaman  [Tue, 15 May 2018 14:49:30 +0000  (10:49 -0400)] 
doc/releases/mimic: tweak RBD major featuresSigned-off-by: Jason Dillaman <dillaman@redhat.com> 
Patrick Donnelly  [Tue, 15 May 2018 13:43:00 +0000  (06:43 -0700)] 
Merge PR #21842 into masterReviewed-by: João Eduardo Luís <joao@suse.de> 
Casey Bodley  [Tue, 15 May 2018 13:40:44 +0000  (09:40 -0400)] 
Merge pull request #21986 from cbodley/wip-24124Reviewed-by: Adam C. Emerson <aemerson@redhat.com> Reviewed-by: Willem Jan Withagen <wjw@digiware.nl> 
Sage Weil  [Tue, 15 May 2018 13:32:10 +0000  (08:32 -0500)] 
Merge pull request #21987 from liewegas/wip-mimic-upgradeReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Sage Weil  [Mon, 14 May 2018 20:16:14 +0000  (15:16 -0500)] 
doc/releases/mimic: upgrade stepsSigned-off-by: Sage Weil <sage@redhat.com> 
Kefu Chai  [Tue, 15 May 2018 12:47:15 +0000  (20:47 +0800)] 
Merge pull request #21809 from tchaikov/wip-22420Reveiwed-by: John Spray <john.spray@redhat.com> 
Lenz Grimmer  [Tue, 15 May 2018 09:19:55 +0000  (11:19 +0200)] 
Merge pull request #21933 from tspmelo/fix-unittest-warningsReviewed-by: Ricardo Marques <rimarques@suse.com> Reviewed-by: Volker Theile <vtheile@suse.com> 
Lenz Grimmer  [Tue, 15 May 2018 09:19:18 +0000  (11:19 +0200)] 
Merge pull request #21967 from votdev/bug_24097Reviewed-by: Ricardo Marques <rimarques@suse.com> 
Lenz Grimmer  [Tue, 15 May 2018 09:17:47 +0000  (11:17 +0200)] 
Merge pull request #21971 from tspmelo/remove-huskyReviewed-by: Stephan Müller <smueller@suse.com> Reviewed-by: Volker Theile <vtheile@suse.com> 
Josh Durgin  [Mon, 14 May 2018 23:18:45 +0000  (16:18 -0700)] 
Merge pull request #21895 from yuriw/wip-yuriw-add-dollar1Reviewed-by: Josh Durgin <jdurgin@redhat.com> 
Yuri Weinstein  [Mon, 14 May 2018 23:14:42 +0000  (16:14 -0700)] 
Merge pull request #21949 from yuriw/wip-yuriw-crontab
Patrick Donnelly  [Mon, 14 May 2018 20:28:49 +0000  (13:28 -0700)] 
Merge PR #21966 into masterReviewed-by: Greg Farnum <gfarnum@redhat.com> Reviewed-by: Zheng Yan <zyan@redhat.com> 
Sage Weil  [Mon, 14 May 2018 20:03:54 +0000  (15:03 -0500)] 
Merge pull request #20975 from theanalyst/doc/releases/mimic-dev-2
Patrick Donnelly  [Mon, 14 May 2018 04:27:51 +0000  (21:27 -0700)] 
mds: handle imported session raceFixes: http://tracker.ceph.com/issues/24087 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Mon, 14 May 2018 02:58:17 +0000  (19:58 -0700)] 
mds: check for session import race
Credit to Yan Zheng for identifying the race condition [1].
[1] https://bugzilla.redhat.com/show_bug.cgi?id=
1572555 #c7
Test-for: http://tracker.ceph.com/issues/24072
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com> 
Casey Bodley  [Mon, 14 May 2018 18:58:03 +0000  (14:58 -0400)] 
Revert "common: add an async SharedMutex"
This reverts commit 
67fe5d25a7bd57841d5d1a2636c4e46ae97ac3e7 .
Fixes: http://tracker.ceph.com/issues/24124 
Signed-off-by: Casey Bodley <cbodley@redhat.com> 
Tiago Melo  [Mon, 14 May 2018 08:41:56 +0000  (09:41 +0100)] 
Mgr/dashboard: Remove husky packageSigned-off-by: Tiago Melo <tmelo@suse.com> 
Lenz Grimmer  [Mon, 14 May 2018 12:20:54 +0000  (14:20 +0200)] 
Merge pull request #21785 from votdev/info_no_rgwReviewed-by: Ricardo Marques <rimarques@suse.com> Reviewed-by: Tatjana Dehler <tdehler@suse.com> 
Yan, Zheng  [Mon, 14 May 2018 11:55:51 +0000  (19:55 +0800)] 
Merge pull request #21975 from ukernel/wip-revert-23837
Yan, Zheng  [Mon, 14 May 2018 11:50:19 +0000  (19:50 +0800)] 
Revert "ceph-fuse: Delete inode's bufferhead was in Tx state would lead a assert fail"
This reverts commit 
07e3bceea78dc8ecd76abb1cafca5c9d1fde521e .
Signed-off-by: "Yan, Zheng" <zyan@redhat.com> 
Volker Theile  [Mon, 7 May 2018 14:50:14 +0000  (16:50 +0200)] 
mgr/dashboard: Display useful info if RGW is not configuredSigned-off-by: Volker Theile <vtheile@suse.com> 
Volker Theile  [Mon, 7 May 2018 14:49:55 +0000  (16:49 +0200)] 
mgr/dashboard: Add ModuleStatusGuardService route guardSigned-off-by: Volker Theile <vtheile@suse.com> 
Volker Theile  [Mon, 7 May 2018 12:45:34 +0000  (14:45 +0200)] 
mgr/dashboard: Add info panel componentSigned-off-by: Volker Theile <vtheile@suse.com> 
Kefu Chai  [Mon, 14 May 2018 10:48:18 +0000  (18:48 +0800)] 
Merge pull request #20118 from b-ranto/wip-selinux-ldconfigReviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Mon, 14 May 2018 10:41:18 +0000  (18:41 +0800)] 
Merge pull request #21943 from tchaikov/wip-24077Reviewed-by: Ricardo Dias <rdias@suse.com> 
Boris Ranto  [Wed, 11 Apr 2018 13:25:59 +0000  (15:25 +0200)] 
selinux: Allow ceph to block suspendSigned-off-by: Boris Ranto <branto@redhat.com> 
Boris Ranto  [Thu, 25 Jan 2018 15:31:30 +0000  (16:31 +0100)] 
selinux: Allow ceph to execute ldconfigFixes: https://tracker.ceph.com/issues/22302 Signed-off-by: Boris Ranto <branto@redhat.com> 
Volker Theile  [Mon, 14 May 2018 06:13:18 +0000  (08:13 +0200)] 
mgr/dashboard: Navbar dropdown button does not respond for mobile-like browsersSigned-off-by: Volker Theile <vtheile@suse.com> 
Kefu Chai  [Mon, 14 May 2018 06:35:02 +0000  (14:35 +0800)] 
Merge pull request #20731 from yuyuyu101/wip-opti-acReviewed-by: Kefu Chai <kchai@redhat.com> 
Mykola Golub  [Sun, 13 May 2018 14:21:08 +0000  (17:21 +0300)] 
Merge pull request #21946 from dillaman/wip-24092Reviewed-by: Mykola Golub <mgolub@suse.com> 
Yuri Weinstein  [Fri, 11 May 2018 19:45:55 +0000  (12:45 -0700)] 
qa/tests: added --filter-out="ubuntu_14.04"Signed-off-by: Yuri Weinstein <yweinste@redhat.com> 
Kefu Chai  [Sat, 12 May 2018 11:20:24 +0000  (19:20 +0800)] 
Merge pull request #21804 from dillaman/wip-24000Reviewed-by: Greg Farnum <gfarnum@redhat.com> 
Kefu Chai  [Sat, 12 May 2018 11:18:50 +0000  (19:18 +0800)] 
Merge pull request #21929 from majianpeng/fio-ceph-objectstoreReviewed-by: Igor Fedotov <ifedotov@suse.com> 
Kefu Chai  [Sat, 12 May 2018 11:15:57 +0000  (19:15 +0800)] 
Merge pull request #21905 from jcsp/wip-24022Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Sat, 12 May 2018 11:10:56 +0000  (19:10 +0800)] 
Merge pull request #21950 from liewegas/wip-23899Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Sat, 12 May 2018 11:08:14 +0000  (19:08 +0800)] 
Merge pull request #21940 from dmick/wip-remove-cephdReviewed-by: Bassam Tabbara <Bassam.Tabbara@Quantum.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Fri, 11 May 2018 14:12:43 +0000  (22:12 +0800)] 
qa/tasks/mgr: fix test_pool.py
* per command desc of "osd pool set", "val" parameter should be a "string"
  not a number. so update the test_pool.py accordingly.
* also as a follow-up of 
65925511bc , we need to update the test
  accordingly to reflect the change in the error's str representation.
Fixes: http://tracker.ceph.com/issues/24077 
Signed-off-by: Kefu Chai <kchai@redhat.com> 
Patrick Donnelly  [Fri, 11 May 2018 21:57:54 +0000  (14:57 -0700)] 
Merge PR #21615 into masterReviewed-by: Zheng Yan <zyan@redhat.com> 
Patrick Donnelly  [Fri, 11 May 2018 21:57:48 +0000  (14:57 -0700)] 
Merge PR #21769 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Fri, 11 May 2018 21:57:42 +0000  (14:57 -0700)] 
Merge PR #21883 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Fri, 11 May 2018 21:57:36 +0000  (14:57 -0700)] 
Merge PR #21923 into masterReviewed-by: Zheng Yan <zyan@redhat.com> 
Yuri Weinstein  [Tue, 8 May 2018 21:31:56 +0000  (14:31 -0700)] 
tests/qa: adding rados/.. dirsSigned-off-by: Yuri Weinstein <yweinste@redhat.com> 
Sage Weil  [Fri, 11 May 2018 20:21:46 +0000  (15:21 -0500)] 
osd: clean up smart probe code a bitSigned-off-by: Sage Weil <sage@redhat.com> 
Dan Mick  [Wed, 9 May 2018 02:24:17 +0000  (19:24 -0700)] 
Remove embedded 'cephd' codeSigned-off-by: Dan Mick <dan.mick@redhat.com> 
Sage Weil  [Fri, 11 May 2018 18:01:38 +0000  (13:01 -0500)] 
Merge pull request #21942 from tchaikov/wip-qa-ceph-disk-no-mon-configReviewed-by: Sage Weil <sage@redhat.com> 
Kefu Chai  [Fri, 11 May 2018 17:46:50 +0000  (01:46  +0800)] 
Merge pull request #21945 from tchaikov/wip-dashboard-errnoReviewed-by: Ricardo Dias <rdias@suse.com> 
David Galloway  [Fri, 11 May 2018 17:31:37 +0000  (13:31 -0400)] 
Merge pull request #21947 from yuriw/wip-yuriw-crontab
Yuri Weinstein  [Fri, 11 May 2018 17:18:27 +0000  (10:18 -0700)] 
qa/tests: added client-upgrade-luminous suitSigned-off-by: Yuri Weinstein <yweinste@redhat.com> 
Jason Dillaman  [Fri, 11 May 2018 17:11:36 +0000  (13:11 -0400)] 
rbd: disable cache for actions that open multiple imagesFixes: http://tracker.ceph.com/issues/24092 Signed-off-by: Jason Dillaman <dillaman@redhat.com> 
Kefu Chai  [Fri, 11 May 2018 16:42:46 +0000  (00:42  +0800)] 
mgr/dashboard: set errno via the parent classSigned-off-by: Ricardo Dias <rdias@suse.com> Signed-off-by: Kefu Chai <kchai@redhat.com> 
Jason Dillaman  [Fri, 11 May 2018 15:23:02 +0000  (11:23 -0400)] 
Merge pull request #21524 from dillaman/wip-23517Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Fri, 11 May 2018 14:32:22 +0000  (22:32 +0800)] 
Merge pull request #21415 from ErwanAliasr1/evelu-cephdiskReviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Fri, 11 May 2018 13:06:51 +0000  (21:06 +0800)] 
qa/workunits/ceph-disk: --no-mon-config
port 
a095ec8b  to the qa/workunits
Signed-off-by: Kefu Chai <kchai@redhat.com> 
Abhishek Lekshmanan  [Fri, 11 May 2018 08:34:10 +0000  (10:34 +0200)] 
doc: add release notes for v13.1.0 mimicSigned-off-by: Abhishek Lekshmanan <abhishek@suse.com> 
Jos Collin  [Fri, 11 May 2018 05:54:22 +0000  (11:24 +0530)] 
align lspools output in file-layouts and manual-freebsd-deployment
align as per https://github.com/ceph/ceph/commit/
50dc08cffd99fd3540d708f6774646806e839553 
Signed-off-by: Jos Collin <jcollin@redhat.com> 
Gu Zhongyan  [Fri, 27 Apr 2018 10:20:02 +0000  (18:20 +0800)] 
osd: fix osd smart data collection segment fault issue.Fixes: http://tracker.ceph.com/issues/23899 Signed-off-by: Gu Zhongyan <guzhongyan@360.cn> 
Yuri Weinstein  [Thu, 10 May 2018 15:58:37 +0000  (08:58 -0700)] 
tests/qa: Adding $ distro mix - rgwSigned-off-by: Yuri Weinstein <yweinste@redhat.com> 
Jason Dillaman  [Thu, 10 May 2018 18:55:38 +0000  (14:55 -0400)] 
Merge pull request #21292 from zy751713126/snapshot_countReviewed-by: Jason Dillaman <dillaman@redhat.com> 
zhengyin  [Mon, 9 Apr 2018 02:50:38 +0000  (10:50 +0800)] 
rbd/info: add snapshot count in rbd infoSigned-off-by: Zheng Yin <zhengyin@huayun.com> 
Jianpeng Ma  [Thu, 10 May 2018 15:56:04 +0000  (23:56 +0800)] 
test/fio: add option single_pool_mode in ceph-bluestore.fioSigned-off-by: Jianpeng Ma <jianpeng.ma@intel.com> 
Sage Weil  [Thu, 10 May 2018 17:19:22 +0000  (12:19 -0500)] 
ceph_release: nautilusSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 10 May 2018 17:18:29 +0000  (12:18 -0500)] 
Merge remote-tracking branch 'gh/mimic'
Sage Weil  [Thu, 10 May 2018 17:16:44 +0000  (12:16 -0500)] 
ceph_release: we are an rc nowSigned-off-by: Sage Weil <sage@redhat.com> 
Tiago Melo  [Thu, 10 May 2018 15:17:39 +0000  (16:17 +0100)] 
mgr/dashboard: Fix unit tests cli warningsSigned-off-by: Tiago Melo <tmelo@suse.com> 
Jason Dillaman  [Thu, 10 May 2018 15:27:43 +0000  (11:27 -0400)] 
Merge pull request #21930 from dillaman/wip-rbd-backports-mimicReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Casey Bodley  [Thu, 10 May 2018 14:51:47 +0000  (10:51 -0400)] 
Merge pull request #21893 from cbodley/wip-rgw-req-state-timeReviewed-by: Adam C. Emerson <aemerson@redhat.com> 
Kefu Chai  [Thu, 10 May 2018 14:45:26 +0000  (22:45 +0800)] 
Merge pull request #21931 from yuriw/wip-yuriw-fix-mimic-subsetReviewed-by: Kefu Chai <kchai@redhat.com> 
Yuri Weinstein  [Thu, 10 May 2018 14:39:51 +0000  (07:39 -0700)] 
tests/qa - fix mimic subset for nightliesSigned-off-by: Yuri Weinstein <yweinste@redhat.com> 
Casey Bodley  [Thu, 10 May 2018 14:26:55 +0000  (10:26 -0400)] 
Merge pull request #21680 from cbodley/wip-rm-replica-logReviewed-by: Orit Wasserman <owasserm@redhat.com> 
Jason Dillaman  [Wed, 9 May 2018 19:01:18 +0000  (15:01 -0400)] 
Revert "stop.sh: use --no-mon-config when trying to unmap rbd devices"
This reverts commit 
6c722cd5f3f829ccf14280e7e36387bafd819c7a .
Signed-off-by: Jason Dillaman <dillaman@redhat.com> 
(cherry picked from commit 
3c6b01574766ca128818461d6630866cc0c0405b )
Jason Dillaman  [Wed, 9 May 2018 16:37:22 +0000  (12:37 -0400)] 
rbd: don't load config overrides from monitor initially
The overrides will be loaded when we connect to the cluster via librados
and the current approach prevents running 'rbd help' without a running
cluster.
Signed-off-by: Jason Dillaman <dillaman@redhat.com> 
(cherry picked from commit 
46eafdabde57736d2a8b63f55cab94461885a957 )
Jason Dillaman  [Fri, 4 May 2018 15:14:34 +0000  (11:14 -0400)] 
rbd-mirror: ensure remote demotion is replayed locally
The bootstrap process cannot immediately quit if it notices the remote
image is not primary. Instead, it needs to continue if the local image is
still chained to the remote.
Fixes: http://tracker.ceph.com/issues/24009 
Signed-off-by: Jason Dillaman <dillaman@redhat.com> 
(cherry picked from commit 
d35bc94319c6fa267e973e533f4591568289ee96 )
Jason Dillaman  [Fri, 4 May 2018 13:24:43 +0000  (09:24 -0400)] 
rbd-mirror: fix potential race between image sync and shut down
Fixes: http://tracker.ceph.com/issues/24008 
Signed-off-by: Jason Dillaman <dillaman@redhat.com> 
(cherry picked from commit 
4f2dbcefc5e3547926b8d34135a808266bd059b8 )
Jason Dillaman  [Fri, 4 May 2018 13:23:27 +0000  (09:23 -0400)] 
rbd-mirror: ensure instance replayer is stoped before destructing
Fixes: http://tracker.ceph.com/issues/24008 
Signed-off-by: Jason Dillaman <dillaman@redhat.com> 
(cherry picked from commit 
9ba94f303072374b5c7c9265c3a493fddce2f8ca )
Kefu Chai  [Thu, 10 May 2018 10:55:42 +0000  (18:55 +0800)] 
Merge pull request #21831 from tchaikov/wip-23966Reviewed-by: Josh Durgin <jdurgin@redhat.com> 
Kefu Chai  [Thu, 10 May 2018 10:54:38 +0000  (18:54 +0800)] 
Merge pull request #21898 from adamemerson/wip-fedora28Reviewed-by: Sage Weil <sage@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Thu, 10 May 2018 10:52:12 +0000  (18:52 +0800)] 
Merge pull request #21861 from adamemerson/wip-clangtasmReviewed-by: Jason Dillaman <dillaman@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Mykola Golub  [Thu, 10 May 2018 10:46:33 +0000  (13:46 +0300)] 
Merge pull request #21912 from dillaman/wip-24064Reviewed-by: Mykola Golub <mgolub@suse.com> 
Mykola Golub  [Thu, 10 May 2018 10:45:35 +0000  (13:45 +0300)] 
Merge pull request #21910 from dillaman/wip-rbd-helpReviewed-by: Mykola Golub <mgolub@suse.com> 
Mykola Golub  [Thu, 10 May 2018 10:44:55 +0000  (13:44 +0300)] 
Merge pull request #21823 from dillaman/wip-24009Reviewed-by: Mykola Golub <mgolub@suse.com> 
Mykola Golub  [Thu, 10 May 2018 10:44:24 +0000  (13:44 +0300)] 
Merge pull request #21817 from dillaman/wip-24008Reviewed-by: Mykola Golub <mgolub@suse.com> 
Kefu Chai  [Thu, 10 May 2018 09:30:22 +0000  (17:30 +0800)] 
Merge pull request #21853 from rishabh-d-dave/volclient-keyargs-for-all-exceptionsReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Kefu Chai  [Thu, 10 May 2018 09:25:33 +0000  (17:25 +0800)] 
Merge pull request #21886 from jcsp/wip-no-install-helloReviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Thu, 10 May 2018 09:24:46 +0000  (17:24 +0800)] 
Merge pull request #21782 from wido/mgr-telegrafReveiwed-by: John Spray <john.spray@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Xuehan Xu  [Thu, 10 May 2018 04:22:24 +0000  (12:22 +0800)] 
mds: set could_consume to false when no purge queue item actually executedFixes: http://tracker.ceph.com/issues/24073 Signed-off-by: Xuehan Xu <xuxuehan@360.cn> 
Nathan Cutler  [Thu, 10 May 2018 05:15:34 +0000  (07:15 +0200)] 
Merge pull request #21918 from smithfarm/wip-24003-mimicReviewed-by: Kefu Chai <kchai@redhat.com> 
Jos Collin  [Thu, 10 May 2018 04:26:23 +0000  (09:56 +0530)] 
Fixed configuration setting standby_replaySigned-off-by: Jos Collin <jcollin@redhat.com> 
Jos Collin  [Thu, 10 May 2018 04:24:44 +0000  (09:54 +0530)] 
Fixed the order of configurationSigned-off-by: Jos Collin <jcollin@redhat.com> 
Kefu Chai  [Thu, 10 May 2018 03:01:55 +0000  (11:01 +0800)] 
Merge pull request #21891 from cbodley/wip-cmake-crypto-pluginsReviewed-by: Casey Bodley <cbodley@redhat.com> 
Jason Dillaman  [Wed, 9 May 2018 19:01:18 +0000  (15:01 -0400)] 
Revert "stop.sh: use --no-mon-config when trying to unmap rbd devices"
This reverts commit 
6c722cd5f3f829ccf14280e7e36387bafd819c7a .
Signed-off-by: Jason Dillaman <dillaman@redhat.com> 
Jason Dillaman  [Thu, 10 May 2018 01:24:55 +0000  (18:24 -0700)] 
Merge pull request #21770 from zy751713126/remove-redundant-codeReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Casey Bodley  [Wed, 9 May 2018 20:32:24 +0000  (16:32 -0400)] 
Merge pull request #21914 from cbodley/wip-common-asyncReviewed-by: Adam C. Emerson <aemerson@redhat.com>