]>
git.apps.os.sepia.ceph.com Git - ceph-ci.git/log 
Abhishek Lekshmanan  [Thu, 23 Feb 2017 10:13:53 +0000  (11:13 +0100)] 
rgw: aws sync module: set keys for rest clientSigned-off-by: Abhishek Lekshmanan <abhishek@suse.com> 
Abhishek Lekshmanan  [Thu, 23 Feb 2017 10:12:31 +0000  (11:12 +0100)] 
rgw: RGWRestConn allow keys to be initializedSigned-off-by: Abhishek Lekshmanan <abhishek@suse.com> 
Abhishek Lekshmanan  [Wed, 22 Feb 2017 18:50:13 +0000  (19:50 +0100)] 
well more hacks to get my previous hack workingSigned-off-by: Abhishek Lekshmanan <abhishek@suse.com> 
Abhishek Lekshmanan  [Mon, 27 Mar 2017 13:03:11 +0000  (15:03 +0200)] 
allow cr http client to deal with non json typesSigned-off-by: Abhishek Lekshmanan <abhishek@suse.com> 
Abhishek Lekshmanan  [Wed, 22 Feb 2017 16:13:03 +0000  (17:13 +0100)] 
non working download clientSigned-off-by: Abhishek Lekshmanan <abhishek@suse.com> 
Abhishek Lekshmanan  [Wed, 22 Feb 2017 12:38:48 +0000  (13:38 +0100)] 
rgw: sync_module: register aws moduleSigned-off-by: Abhishek Lekshmanan <abhishek@suse.com> 
Abhishek Lekshmanan  [Wed, 22 Feb 2017 12:35:28 +0000  (13:35 +0100)] 
rgw: make RGWSyncModule classes for AWSSigned-off-by: Abhishek Lekshmanan <abhishek@suse.com> 
Abhishek Lekshmanan  [Tue, 21 Feb 2017 16:46:16 +0000  (17:46 +0100)] 
rgw: sync aws module compilesSigned-off-by: Abhishek Lekshmanan <abhishek@suse.com> 
Abhishek Lekshmanan  [Tue, 21 Feb 2017 10:08:45 +0000  (11:08 +0100)] 
rgw: sync plugin for aws (the humble beginnings!)Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com> 
Yehuda Sadeh  [Tue, 10 Apr 2018 14:59:10 +0000  (07:59 -0700)] 
Merge pull request #19283 from yehudasa/wip-rgw-mfaReviewed-by: Casey Bodley <cbodley@redhat.com> 
Ricardo Dias  [Tue, 10 Apr 2018 14:58:26 +0000  (15:58 +0100)] 
Merge pull request #21327 from LenzGr/dashboard-fork-awesomeReviewed-by: Tiago Melo <tmelo@suse.com> Reviewed-by: Volker Theile vtheile@suse.com 
Patrick Donnelly  [Tue, 10 Apr 2018 14:54:14 +0000  (07:54 -0700)] 
Merge PR #21080 into masterReviewed-by: Kefu Chai <kchai@redhat.com> Reviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Lenz Grimmer  [Tue, 10 Apr 2018 14:47:03 +0000  (16:47 +0200)] 
Merge pull request #21126 from tspmelo/wip-servicesReviewed-by: Ricardo Marques <rimarques@suse.com> Reviewed-by: Stephan Müller <smueller@suse.com> 
Lenz Grimmer  [Tue, 10 Apr 2018 12:59:46 +0000  (14:59 +0200)] 
mgr/dashboard: Replace font-awesome with fork-awesomeSigned-off-by: Lenz Grimmer <lgrimmer@suse.com> 
Kefu Chai  [Tue, 10 Apr 2018 12:12:08 +0000  (20:12 +0800)] 
Merge pull request #21319 from majianpeng/doc-remove-osd-op-threadsReviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Tue, 10 Apr 2018 10:51:12 +0000  (18:51 +0800)] 
Merge pull request #21112 from guzhongyan/fix-vlogReviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Tue, 10 Apr 2018 10:49:01 +0000  (18:49 +0800)] 
Merge pull request #21028 from rzarzynski/wip-osd-get_rw_locks-norefcntReviewed-by: Sage Weil <sage@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Tue, 10 Apr 2018 10:47:58 +0000  (18:47 +0800)] 
Merge pull request #21235 from xiexingguo/wip-fix-obj-startReviewed-by: Sage Weil <sage@redhat.com> 
Josh Durgin  [Tue, 10 Apr 2018 05:27:16 +0000  (22:27 -0700)] 
Merge pull request #21313 from ceph/wip-pg-clean-timeoutReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Kefu Chai  [Tue, 10 Apr 2018 05:21:31 +0000  (13:21 +0800)] 
Merge pull request #21284 from tchaikov/wip-cmake-libstdcxxReviewed-by: Zheng Yan <zyan@redhat.com> 
Kefu Chai  [Tue, 10 Apr 2018 05:19:08 +0000  (13:19 +0800)] 
Merge pull request #21290 from rjfd/wip-dashboard-fix-rest-controllerReviewed-by: Sebastian Wagner <sebastian.wagner@suse.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Patrick Donnelly  [Tue, 10 Apr 2018 04:33:15 +0000  (21:33 -0700)] 
Merge PR #21039 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 10 Apr 2018 04:33:10 +0000  (21:33 -0700)] 
Merge PR #21040 into masterReviewed-by: John Spray <john.spray@redhat.com> Reviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 10 Apr 2018 04:33:06 +0000  (21:33 -0700)] 
Merge PR #21132 into masterReviewed-by: Jos Collin <jcollin@redhat.com> Reviewed-by: Patrick Donnelly <pdonnell@redhat.com> Reviewed-by: Zheng Yan <zyan@redhat.com> 
Patrick Donnelly  [Tue, 10 Apr 2018 04:33:00 +0000  (21:33 -0700)] 
Merge PR #21144 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 10 Apr 2018 04:32:56 +0000  (21:32 -0700)] 
Merge PR #21167 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 10 Apr 2018 04:32:51 +0000  (21:32 -0700)] 
Merge PR #21191 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 10 Apr 2018 04:32:47 +0000  (21:32 -0700)] 
Merge PR #21255 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Josh Durgin  [Tue, 10 Apr 2018 00:44:33 +0000  (17:44 -0700)] 
Merge pull request #21295 from badone/wip-large-omap-scrub-big-random-loser-2Reviewed-by: Josh Durgin <jdurgin@redhat.com> 
Vasu Kulkarni  [Tue, 10 Apr 2018 00:24:42 +0000  (17:24 -0700)] 
qa/tasks: wait_for_clean is called after ceph task as well after osd's are up,Signed-off-by: Vasu Kulkarni <vasu@redhat.com> 
Jianpeng Ma  [Mon, 9 Apr 2018 21:39:59 +0000  (05:39  +0800)] 
doc: remove unused config: "osd op threads"Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com> 
Yuri Weinstein  [Mon, 9 Apr 2018 19:37:57 +0000  (12:37 -0700)] 
Merge pull request #21309 from ceph/wip-yuriw-crontabReviewed-by: Neha Ojha <nojha@redhat.com> 
Sage Weil  [Mon, 9 Apr 2018 19:16:49 +0000  (14:16 -0500)] 
Merge pull request #21282 from liewegas/wip-pgpool-encReviewed-by: Josh Durgin <jdurgin@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> Reviewed-by: Ilya Drymov <idryomov@redhat.com> 
Yuri Weinstein  [Mon, 9 Apr 2018 16:17:10 +0000  (09:17 -0700)] 
qa/tests - minor clean ups and made perf-suite run 3 times, so we can have more data pointsSigned-off-by: Yuri Weinstein <yweinste@redhat.com> 
Patrick Donnelly  [Mon, 9 Apr 2018 15:59:11 +0000  (08:59 -0700)] 
Merge PR #21263 into masterReviewed-by: Douglas Fuller <dfuller@redhat.com> 
Tiago Melo  [Thu, 29 Mar 2018 11:35:49 +0000  (12:35 +0100)] 
mgr/dashboard: Move services provision to service moduleSigned-off-by: Tiago Melo <tmelo@suse.com> 
Tiago Melo  [Thu, 29 Mar 2018 00:36:41 +0000  (01:36  +0100)] 
mgr/dashboard: Add Api moduleSigned-off-by: Tiago Melo <tmelo@suse.com> 
Lenz Grimmer  [Mon, 9 Apr 2018 15:43:46 +0000  (17:43 +0200)] 
Merge pull request #20807 from Devp00l/improve-table-searchReviewed-by: Tiago Melo <tmelo@suse.com> Reviewed-by: Ricardo Marques <rimarques@suse.com> Reviewed-by: Ricardo Dias <rdias@suse.com> 
Lenz Grimmer  [Mon, 9 Apr 2018 15:32:00 +0000  (17:32 +0200)] 
Merge pull request #20943 from tspmelo/fix-e2eReviewed-by: Ricardo Dias <rdias@suse.com> Reviewed-by: Ricardo Marques <rimarques@suse.com> Reviewed-by: Stephan Müller <smueller@suse.com> 
Yehuda Sadeh  [Thu, 5 Apr 2018 02:23:08 +0000  (19:23 -0700)] 
common/options: add otp to default osd class load listSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Wed, 4 Apr 2018 21:29:23 +0000  (14:29 -0700)] 
rgw: mfa documentationSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Wed, 4 Apr 2018 18:31:37 +0000  (11:31 -0700)] 
qa/tasks/s3tests: configure mfa testsSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Fri, 23 Mar 2018 17:24:35 +0000  (10:24 -0700)] 
rgw: require mfa only if mfa status actually changesSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Wed, 21 Mar 2018 22:33:45 +0000  (15:33 -0700)] 
rgw: add distro dependencies for liboathSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Wed, 14 Feb 2018 23:18:03 +0000  (15:18 -0800)] 
rgw: fixes following rebaseSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Mon, 4 Dec 2017 13:58:43 +0000  (05:58  -0800)] 
cls/otp: fixes following reviewSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Mon, 4 Dec 2017 13:42:51 +0000  (05:42  -0800)] 
rgw, cls/otp: support for base32 seed typeSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Mon, 4 Dec 2017 12:28:37 +0000  (04:28  -0800)] 
cls/otp, rgw-admin: use older liboath api, parse seed onceSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Mon, 4 Dec 2017 07:30:21 +0000  (23:30 -0800)] 
cls/otp: preserve otp history when modifying itSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Sun, 3 Dec 2017 14:31:18 +0000  (06:31 -0800)] 
rgw-admin, cls/otp: get current time for otp resync from osdSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Sun, 3 Dec 2017 13:53:22 +0000  (05:53  -0800)] 
rgw-admin: add mfa resync commandSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Fri, 1 Dec 2017 15:06:36 +0000  (07:06 -0800)] 
rgw: cleanupSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Fri, 1 Dec 2017 15:05:51 +0000  (07:05 -0800)] 
cls/otp: integrate with liboathSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Fri, 1 Dec 2017 11:24:28 +0000  (03:24  -0800)] 
rgw: set objv_tracker for metadata mutateSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Thu, 30 Nov 2017 13:49:15 +0000  (05:49  -0800)] 
rgw_admin: use metadata mutate for mfa updatesSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Thu, 30 Nov 2017 10:29:41 +0000  (02:29  -0800)] 
rgw: better api for metadata mutationSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Thu, 23 Nov 2017 02:14:00 +0000  (18:14 -0800)] 
rgw: tie otp meta get/put to meta log, objv_trackerSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Thu, 23 Nov 2017 00:25:41 +0000  (16:25 -0800)] 
rgw: trivial implementation of otp meta handlersSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Wed, 22 Nov 2017 23:49:32 +0000  (15:49 -0800)] 
cls/otp: client api to set multiple keysSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Wed, 22 Nov 2017 23:47:46 +0000  (15:47 -0800)] 
cls/otp: update header anyway, don't use omap headerSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Tue, 21 Nov 2017 23:11:34 +0000  (15:11 -0800)] 
rgw: initial work to add otp as metadata providerSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Tue, 21 Nov 2017 22:50:23 +0000  (14:50 -0800)] 
rgw: fix mfa setting, verify on object deletionSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Mon, 4 Dec 2017 08:18:31 +0000  (00:18  -0800)] 
rgw: S3 get bucket versioning returns MFA statusSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Mon, 4 Dec 2017 08:06:35 +0000  (00:06  -0800)] 
rgw: functionality to modify mfa entries in user metadataSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Mon, 4 Dec 2017 07:54:33 +0000  (23:54 -0800)] 
rgw-admin: new mfa control commandsSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Mon, 4 Dec 2017 07:51:38 +0000  (23:51 -0800)] 
rgw: add otp pool, create otp service functionalitySigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Mon, 4 Dec 2017 07:48:04 +0000  (23:48 -0800)] 
cls/otp: implement otp_info_t::dump()Signed-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Mon, 4 Dec 2017 07:45:31 +0000  (23:45 -0800)] 
cls_otp: treat empty header as -ENOENTSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Fri, 17 Nov 2017 23:40:25 +0000  (15:40 -0800)] 
rgw: send totp check to the otp objclassSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Fri, 17 Nov 2017 22:49:21 +0000  (14:49 -0800)] 
rgw: req_state members init refactorSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Thu, 16 Nov 2017 01:04:22 +0000  (17:04 -0800)] 
cls/otp: add client interfacesSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Wed, 15 Nov 2017 01:47:30 +0000  (17:47 -0800)] 
cls/otp: implement totp check logicSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Tue, 14 Nov 2017 23:57:07 +0000  (15:57 -0800)] 
cls/otp: initial workSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Thu, 9 Nov 2017 23:31:26 +0000  (18:31 -0500)] 
rgw: mfa - initial workSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Alfredo Deza  [Mon, 9 Apr 2018 13:58:56 +0000  (09:58 -0400)] 
Merge pull request #20758 from ceph/wip-cv-doc-typosReviewed-by: Lenz Grimmer <lgrimmer@suse.com> 
Mykola Golub  [Mon, 9 Apr 2018 13:22:03 +0000  (16:22 +0300)] 
Merge pull request #21249 from dillaman/wip-18844Reviewed-by: Mykola Golub <mgolub@suse.com> 
Sage Weil  [Sun, 8 Apr 2018 19:40:45 +0000  (14:40 -0500)] 
osd/OSDMap: propagate POOL_SNAPS|SELFMANAGED_SNAPS to tiersSigned-off-by: Sage Weil <sage@redhat.com> 
Alfredo Deza  [Mon, 9 Apr 2018 11:02:50 +0000  (07:02 -0400)] 
Merge pull request #21196 from jeffrey4l/fix_typoReviewed-by: Wido den Hollander <wido@42on.com> Reviewed-by: Alfredo Deza <adeza@redhat.com> 
Lenz Grimmer  [Mon, 9 Apr 2018 10:34:25 +0000  (12:34 +0200)] 
Merge pull request #21270 from Devp00l/ceph-table-action-fixReviewed-by: Ricardo Marques <rimarques@suse.com> Reviewed-by: Tiago Melo <tmelo@suse.com> Reviewed-by: Volker Theile <vtheile@suse.com> 
Ricardo Dias  [Sun, 8 Apr 2018 17:37:30 +0000  (18:37 +0100)] 
mgr/dashboard: restcontroller: fix detection of id args in element requestsFixes: https://tracker.ceph.com/issues/23593 Signed-off-by: Ricardo Dias <rdias@suse.com> 
Boris Ranto  [Mon, 9 Apr 2018 08:40:42 +0000  (10:40 +0200)] 
Merge pull request #21269 from b-ranto/wip-mgr-expose-rgwReviewed-by: John Spray <john.spray@redhat.com> 
Brad Hubbard  [Mon, 9 Apr 2018 01:46:32 +0000  (11:46 +1000)] 
qa/suites/rados: Disable scrub backoffFixes: http://tracker.ceph.com/issues/23578 Signed-off-by: Brad Hubbard <bhubbard@redhat.com> 
Gu Zhongyan  [Thu, 29 Mar 2018 07:44:25 +0000  (15:44 +0800)] 
misc: fix various log messagesSigned-off-by: Gu Zhongyan <guzhongyan@360.cn> 
Mykola Golub  [Sun, 8 Apr 2018 20:22:38 +0000  (23:22 +0300)] 
Merge pull request #21248 from dillaman/wip-23548Reviewed-by: Mykola Golub <mgolub@suse.com> 
Nathan Cutler  [Sun, 8 Apr 2018 06:54:27 +0000  (08:54 +0200)] 
Merge pull request #17531 from smithfarm/wip-calamari-testsReviewed-by: John Spray <john.spray@redhat.com> Reviewed-by: Lenz Grimmer <lenz@grimmer.com> 
Xie Xingguo  [Sun, 8 Apr 2018 05:37:00 +0000  (13:37 +0800)] 
Merge pull request #21245 from ifed01/wip-ifed-shard-bug-loggingReviewed-by: xie xingguo <xie.xingguo@zte.com.cn> 
Kefu Chai  [Sun, 8 Apr 2018 01:57:36 +0000  (09:57 +0800)] 
cmake: define HAVE_STDLIB_MAP_SPLICING for both libstdc++ and libc++Signed-off-by: Kefu Chai <kchai@redhat.com> 
Sage Weil  [Sat, 7 Apr 2018 18:36:32 +0000  (13:36 -0500)] 
osd/osd_types: fix pg_pool_t encoding for hammer
If we are missing the hammer feature, we will also be missing the
luminous feature, but we should still encode like hammer.
Analogous fix to 
e28e0c617af8825ae92cced5d87cc4f403709e48 
Signed-off-by: Sage Weil <sage@redhat.com> 
Kefu Chai  [Sat, 7 Apr 2018 09:31:04 +0000  (17:31 +0800)] 
Merge pull request #20866 from jan--f/mgr-fix-metadata-returnReviewed-by: Sage Weil <sage@redhat.com> Reviewed-by: Joao Eduardo Luis <joao@suse.de> Reviewed-by: John Spray <john.spray@redhat.com> 
Kefu Chai  [Sat, 7 Apr 2018 09:29:57 +0000  (17:29 +0800)] 
Merge pull request #21217 from tchaikov/wip-cmp-hobjectReviewed-by: xie xingguo <xie.xingguo@zte.com.cn> Reviewed-by: Sage Weil <sage@redhat.com> 
Kefu Chai  [Sat, 7 Apr 2018 09:29:15 +0000  (17:29 +0800)] 
Merge pull request #21211 from tchaikov/wip-clang-without-map-mergeReviewed-by: Zheng Yan <zyan@redhat.com> 
Kefu Chai  [Sat, 7 Apr 2018 09:27:15 +0000  (17:27 +0800)] 
Merge pull request #21161 from cbodley/wip-mon-config-obsReviewed-by: Sage Weil <sage@redhat.com> 
Kefu Chai  [Sat, 7 Apr 2018 09:25:48 +0000  (17:25 +0800)] 
Merge pull request #21151 from xiexingguo/wip-prune-olrReviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Sat, 7 Apr 2018 09:24:56 +0000  (17:24 +0800)] 
Merge pull request #21150 from xiexingguo/wip-large-omap-obj-countingReviewed-by: Greg Farnum <gfarnum@redhat.com> Reviewed-by: David Zafman <dzafman@redhat.com> 
Kefu Chai  [Sat, 7 Apr 2018 09:23:35 +0000  (17:23 +0800)] 
Merge pull request #21119 from Liuchang0812/refine-optracker-historyReviewed-by: Sage Weil <sage@redhat.com> 
Kefu Chai  [Sat, 7 Apr 2018 09:22:01 +0000  (17:22 +0800)] 
Merge pull request #21095 from wido/ceph-metadata-versionReviewed-by: John Spray <john.spray@redhat.com> 
Kefu Chai  [Sat, 7 Apr 2018 09:21:06 +0000  (17:21 +0800)] 
Merge pull request #21055 from tchaikov/wip-pr-20994Reviewed-by: Josh Durgin <jdurgin@redhat.com> 
Willem Jan Withagen  [Sun, 1 Apr 2018 12:34:48 +0000  (14:34 +0200)] 
mds: Clang does not (yet) support std::map::mergeSigned-off-by: Willem Jan Withagen <wjw@digiware.nl> 
Kefu Chai  [Tue, 3 Apr 2018 12:00:14 +0000  (20:00 +0800)] 
cmake: detect if std::map::merge() is supportedSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Sat, 7 Apr 2018 03:59:28 +0000  (11:59 +0800)] 
Merge pull request #21274 from dzafman/wip-cot-configReviewed-by: Kefu Chai <kchai@redhat.com>