summaryrefslogtreecommitdiffstats
path: root/docs/submodules/oom.git
AgeCommit message (Collapse)AuthorFilesLines
2019-10-27Update git submodulesBorislav Glozman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 8829b4f35c6efd700b31022e6771ceeae3e41039 - Merge "Increase liveness/readiness probe timeouts." - Increase liveness/readiness probe timeouts. Issue-ID: CCSDK-1822 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: Ib75741d85cfe8d0d5129dac6d11d0a3468627320
2019-10-25Update git submodulesMike Elliott1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 15dd9092b150ff94a26f7041f1f5745d257f77e1 - Merge "Update policy brmsgw to point to latest versions" - Update policy brmsgw to point to latest versions Issue-ID: POLICY-2171 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Iaff0090a25990612c04d58147d4f9dfd20e4111f
2019-10-25Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 2ee8f97d05bccd51fb03437ac4331f810e6f2bd9 - Update git submodules * Update kubernetes/robot from branch 'master' to 868374dc9e41555fa9e75a0ca63deb7cd6780ab9 - Update to 1.5.4 Issue-ID: TEST-216 Change-Id: Ia00b0ab26a47cfd3306ccc14f1f7950c54690144 Signed-off-by: Brian Freeman <bf1936@att.com> (cherry picked from commit 71d1a6e7ea4cdba97aed46c66921ab213b4588ff)
2019-10-24Manually update submodulesKrzysztof Opasiak1-0/+0
Automated submodules updated is currently broken. Let's update repos manually. Issue-ID: DOC-552 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: I1851c5f2b1ae0b0433b2fd60da2e3de8213753f3
2019-10-14Update git submodulessu622b1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 8b763cd0c644dec143482e40ab54710d983cacfa - add probe timeout to value.yaml Issue-ID: DMAAP-1328 Change-Id: Ic5430d4029ab9e95edb63aac9f11b1f5b148cbb9 Signed-off-by: su622b <su622b@att.com>
2019-10-11Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to f1aff42cf6f03599e75007f4d0c74d780c3d025b - Merge "Upgrade drools cl app image" - Upgrade drools cl app image Issue-ID: POLICY-2156 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Idde12043286d715a1de27d581701a41f7a72739d
2019-10-11Update git submodulesMike Elliott1-0/+0
* Update docs/submodules/oom.git from branch 'master' to e569de3f78f1e1223801c0b37169558f9d3ac592 - Add Known Issues to release notes El Alto High defects that are pushed to Frankfurt. Issue-ID: OOM-2103 Signed-off-by: Mike Elliott <mike.elliott@amdocs.com> Change-Id: I2570d1e299072e1ac96dbc3fcbe19181cd568bd0 (cherry picked from commit f40ce5c9f5db76331d7aa895615c06a636d1940e)
2019-10-11Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to ba710fbe7f4cd47439324150d5b835501b2114d5 - Merge "Align on release 4.1.3" - Align on release 4.1.3 Align the charts on the 4.1.3 clamp containers + fix the dcae parameters to https4 + remove old db files Issue-ID: CLAMP-513 Change-Id: I0429d1888f78d1a0f5ed7543cf0f9bb9cd77e652 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2019-10-11Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to b42007ad4a23c3266b2762130dcc8d4c224c1226 - Merge "Use SDNC 1.7.4 version" - Use SDNC 1.7.4 version Update SDNC helm charts to use version 1.7.4 (final El Alto release) Change-Id: I257ac3b4a5780f612e2bcb84950231ed07a96876 Issue-ID: SDNC-939 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-10-11Update git submodulesMike Elliott1-0/+0
* Update docs/submodules/oom.git from branch 'master' to cddc62cd03bdf28daed32809a6c0aea45e1c4592 - Merge "Make readiness-check work when updatedReplicas is None" - Make readiness-check work when updatedReplicas is None Issue-ID: OOM-2057 Signed-off-by: Akansha Dua <akansha.dua@amdocs.com> Change-Id: I8deb64ee5c5e9667f63a61a7204a83b095a2fc34
2019-10-11Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 50f825e6ba947d0de8f5082ab29e43011a523891 - Merge "Fix deploy on failure of subproject" - Fix deploy on failure of subproject Issue-ID: OOM-2114 Signed-off-by: Mike Elliott <mike.elliott@amdocs.com> Change-Id: I8fd18f0e58cc680000a46299c8997e51b1f2dc8e
2019-10-11Update git submodulesJames MacNider1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 6b4fc784f3c7bfce405a430523a4d29932e536d0 - Merge "Removed space from slave_nfs_node.sh" - Removed space from slave_nfs_node.sh Issue-ID: OOM-1577 Signed-off-by: Mike Elliott <mike.elliott@amdocs.com> Change-Id: I8314d029ac9acc3a35488a57a8eecd3d53aa3845
2019-10-11Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 73cecb5a1545337ff697a8f277416412bfe39393 - Merge "Remove docker-config runtime internet dependency" - Remove docker-config runtime internet dependency Adding orginally downloaded resources directly to pod volumes Issue-ID: SO-1917 Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com> Change-Id: I7edf86e625e50987cea3a3c502eb391672f958f5
2019-10-10Update git submodulesRamesh Parthasarathy1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 74d6563043bd45b7487387e02852c31c0bf7d25f - Corrected SO SDNC Adapter callback URL Corrected SO SDNC Adapter callback URL with sdnc adapter override.yaml file Issue-ID: SO-2401 Signed-off-by: Ramesh Parthasarathy(rp6768)<ramesh.parthasarathy@att.com> Change-Id: Iae8507445c99223d54becccacaab53a3aa48037a
2019-10-07Update git submodulesJames Forsyth1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 55b95ec89e68c41614730a61b491967bdcbf7ffe - Update git submodules * Update kubernetes/aai from branch 'master' to 1a2274dc0d8089b12a4b6feff328153dd9b26215 - Merge "[AAI-2617] Search guard is no longer available" - [AAI-2617] Search guard is no longer available Change-Id: I5cc786073ac27d3d36d05f0aa89ac5b7f1aadc02 Signed-off-by: rajeevme<rajeev.mehta@amdocs.com> Change-Id: I6b8ce9867d8b1d8108fcd7002e84f798a5b4e8e2
2019-10-07Update git submodulesafenner1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 8936d6aa640e3e55ca02ffdac4a577d80bda91d9 - Fixing Basic Modeling genericparser API Health Check Failing Change-Id: If2cf110e0387acaff61d996435efdedf41561b60 Issue-ID: OOM-2126 Signed-off-by: afenner <andrew.fenner@est.tech>
2019-10-06Update git submodulesBorislav Glozman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to b3209d913c1e43830ecaaf2b89f627fe4e930906 - Merge "Add El Alto release notes" - Add El Alto release notes Issue-ID: OOM-2103 Signed-off-by: Mike Elliott <mike.elliott@amdocs.com> Change-Id: I9a378602c8d73df4df2fef4fcf52b88fa5000eb6
2019-10-04Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to eeebff31ba9ad1358ee97a8df37586864098304a - Merge "Change port mapping on DMaaP DR prov" - Change port mapping on DMaaP DR prov Change-Id: I6467c37800ec96bd1b030f0576ce690d408ff5b6 Signed-off-by: efiacor <fiachra.corcoran@est.tech> Issue-ID: INT-1296
2019-10-04Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to efa45c96126380016456fb2ae4f9acdc4166751b - Merge "Use SO simulutor in cmso-robot" - Use SO simulutor in cmso-robot Issue-ID: OPTFRA-509 Change-Id: I2549e396311ad9582b898493e6bce311141a3b95 Signed-off-by: Jerry Flood <jflood@att.com>
2019-10-04Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to c8c79af678e8ad916a3cc766acc0e931ea3184a2 - Merge "Fix https config for admin portal" - Fix https config for admin portal Fix config of admin portal to expose https instead of http Change-Id: Ie5d94921fd0fdbe0ea4866385f07fa8859ba59a6 Issue-ID: OJSI-98 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-10-04Update git submodulesMike Elliott1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 79d2f504e49215df6d918ed7e96469f3f460f5c7 - Merge "Increase liness/readiness timeout and period" - Increase liness/readiness timeout and period Issue-ID: OOM-2059 Change-Id: I02bbdd5b06e7194434d761bcf1aebbd749c6f1d7 Signed-off-by: Brian Freeman <bf1936@att.com>
2019-10-04Update git submodulesAkansha Dua1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 7f145c7b0769849c2fae9677fa3daa6a58ca99d1 - Increasing Max Heap size to 2GB Issue-ID: OOM-2059 Signed-off-by: Akansha Dua <akansha.dua@amdocs.com> Change-Id: I9b8db6ff689c0928ac497b523290e586c0f6f1f8
2019-10-03Update git submodulesMike Elliott1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 1f34c067edc3ba2138bc6a454200eb0128a31503 - Updated docs to ref 5.0.1-ONAP tag Issue-ID: OOM-1590 Signed-off-by: Mike Elliott <mike.elliott@amdocs.com> Change-Id: I61b3531545b5a648fcfabb850ee85fa5f0a4a46a
2019-10-03Update git submodulesIttay Stern1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 2c00e1a17308bf1007b0f722bcb8568f72d4ab78 - New VID certificate valid until: Oct 03, 2020 Issue-ID: VID-650 Change-Id: I5a844993619002eb0792e3ebb62788dc69562309 Signed-off-by: Ittay Stern <ittay.stern@att.com>
2019-10-03Update git submodulesBorislav Glozman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to e2e79d111bf61f22e284c97bb139b9e73e715b29 - Merge "Updated software versions for El Alto" - Updated software versions for El Alto Documentation updates. Issue-ID: OOM-1590 Signed-off-by: Mike Elliott <mike.elliott@amdocs.com> Change-Id: I4c87d295b140b4be39317b03527470bdd88ab3e9
2019-10-02Update git submodulesBorislav Glozman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 5052c3871190e6ea73c71c69081fcfc38b713ed6 - Merge "Improved nginx configuration overrrides" - Improved nginx configuration overrrides Nginx ingress controller configuration sample adopted to the new ingress configuration common templates. Issue-ID: OOM-1508 Signed-off-by: Lucjan Bryndza <l.bryndza@samsung.com> Change-Id: I1e8f069dbcff8ae3c927bad763d1bc2595cc9311 Signed-off-by: Lucjan Bryndza <l.bryndza@samsung.com>
2019-10-02Update git submodulesBorislav Glozman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to ebea0a45413b5662467723f5643ac48328af367c - Merge "Update multicloud framework image tags" - Update multicloud framework image tags tag with 1.4.2 which fixed a severe bug MULTICLOUD-835 Issue-ID: MULTICLOUD-841 Signed-off-by: Bin Yang <Bin.Yang@windriver.com> Change-Id: I478778412c67fd9ba726830cc05d4e02a1e5648d
2019-10-02Update git submodulesBorislav Glozman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 7a43a229a14928723589ae66e385f78ab41f6e21 - Merge "update OOM configuration for modeling/etsicatalog" - update OOM configuration for modeling/etsicatalog Change-Id: Ie6f18487961bc7de723f5dc69e37abfd5006f550 Issue-ID: MODELING-222 Signed-off-by: dyh <dengyuanhong@chinamobile.com>
2019-09-30Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 07c610db63ffe687eba3b9b0e11738a4dddad8a9 - Merge "APPC 1.6.4 docker released" - APPC 1.6.4 docker released change value files to refect for El Alto release Issue-ID: APPC-1735 Change-Id: Ia882fdbf29a8b5e4321c9942705097e997044e1a Signed-off-by: Taka Cho <takamune.cho@att.com>
2019-09-30Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 2f319f05a43cc4f3b71059ead2c6f491288f5127 - Merge "change accessMode for oom" - change accessMode for oom Change-Id: I156e5d688023d96954a106e6b6e81f7911f91e2b Issue-ID: VFC-1523 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2019-09-30Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 009c3cc6b16ebcb36de6d8df7aea15b0e97d8c74 - Merge "Update MSB docker image version for E release" - Update MSB docker image version for E release Issue-ID: MSB-380 Change-Id: I63ebface924066f6ff828025e423fb2ddcd0482d Signed-off-by: Huabing Zhao <zhao.huabing@zte.com.cn>
2019-09-30Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 6d7e481523f353efcdc4aa395bb2a144c1c07dc1 - Merge "Update docker image version" - Update docker image version Update docker image version to latest version from docker hub. Issue-ID: OOM-2117 Change-Id: I4de4fec038c6a305363df95feba171bfba0cd410 Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
2019-09-30Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to c24008e58e49e8e92f871d12e29f85233e64ed94 - Merge "Update dgbuilder for https" - Update dgbuilder for https Update dgbuilder to use latest release (0.6.3) with https support and update configuration to enable https Change-Id: Ia04a3cde6b0f18655301e25dcf125ffcdf1ec120 Issue-ID: OJSI-100 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-09-28Update git submodulesJimmy Forsyth1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 10bfee48a92b6a075817202035812f53c7dfe9bb - Update git submodules * Update kubernetes/aai from branch 'master' to d68960684392a6da61805e4161ae032549db6102 - Update to new haproxy certificate Issue-ID: AAI-2643 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: Iaca4ed32243b34a6d8daa7b67f094bb0d236acb9
2019-09-23Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 92299a31899fb4509175cc1c1b7c504938e22cfd - Merge "Update POMBA images to 1.5.1" - Update POMBA images to 1.5.1 Issue-ID: LOG-1120 Signed-off-by: Prudence Au <prudence.au@amdocs.com> Change-Id: Ie4621751739a3bab67f6ad928aa124d8328a4455
2019-09-23Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 45f44b7ad5a8180ce313ef8e3eeb0322b165b822 - Merge "Update CCSDK/SDNC versions for RC0" - Update CCSDK/SDNC versions for RC0 Update CCSDK version to RCO (0.6.3) and update SDNC version to RC0 (1.7.3) Change-Id: I4af5684ecacd2cf8134a4db51684fb95b488d536 Issue-ID: SDNC-917 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-09-23Update git submodulesBorislav Glozman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 68527ef5b695e6354472596738cedd51a97f96bc - Merge "Update multicloud broker and openstack version" - Update multicloud broker and openstack version Change-Id: I0054f1b90372ecd60de49e0c9cbd42e0f7a0cb40 Issue-ID: MULTICLOUD-809 Signed-off-by: Bin Yang <bin.yang@windriver.com>
2019-09-23Update git submodulesBorislav Glozman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 488ef7702fde0b9e149a2e37323321cb6545f7c6 - Merge "Update vfc release version to oom" - Update vfc release version to oom Change-Id: Ib3390afb9c1e154d9cadf9d7dc7707b35d37a8fe Issue-ID: VFC-1494 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2019-09-23Update git submodulesBorislav Glozman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 7ffb638869330486ac81190267b1346b01038f9e - Merge "Add msb environment to oom" - Add msb environment to oom Change-Id: I9c1321955c59b6f29c454aced0c00f713f5384ea Issue-ID: VFC-1467 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2019-09-23Update git submodulesjhh1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 8534fea88e181c5ac2a0c35ace33e8a818e80d61 - Disable AAF for PDP-D telemetry API As AAF cadi libraries and Aether libraries (transitively brought in by drools kie-ci functionality seem to interfere with each other, AAF is disabled. There is no side effects to disable AAF for this API as it is not an external API (it is used for diagnostics only). The nexus value change is cosmetic, not really used. Issue-ID: POLICY-2109 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I2ccb3b0f08a4d3020e58ca83bd89d2f614a51dca
2019-09-20Update git submodulesEthan Lynn1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 900c3831050278e12e7508d01db9063542fabde7 - Update multicloud-vio to version 1.4.1 Update multicloud-vio to version 1.4.1 Change-Id: I788a58fbb86cba4f2b8b4ddac14812155e6c096e Issue-ID: MULTICLOUD-736 Signed-off-by: Ethan Lynn <xuanlangjian@gmail.com>
2019-09-19Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to f4fe4cb8cae08ed36fbd54e45092cb116a1b3d6e - Merge "Bump OPTF-HAS to 1.3.3" - Bump OPTF-HAS to 1.3.3 Issue-ID: OPTFRA-561 Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com> Change-Id: I132dcb2adaed78a97822c4fae77026eddfb51df9
2019-09-19Update git submodulesAlexis de Talhouët1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 2680070c8031c94d9d65a9b2ee7281ed19bb0209 - Merge "Correct cds-blueprint-processor chart to include ONAP Root CA" - Correct cds-blueprint-processor chart to include ONAP Root CA Issue-ID: OOM-2026 Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com> Change-Id: Id742c289e1ea0d269105d6b70f21e1ede3db0790
2019-09-19Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to b55649553ce3f1cb68db72330b85d1a77c480fd6 - Merge "add PV support for artifactbroker" - add PV support for artifactbroker add PV/PVC files - update deployment files to use PVC and resolve permission issue of data dir - update values for the init container image Change-Id: I354043a79915d25bf1e5396b538b98b0dbdb7fe7 Issue-ID: MULTICLOUD-717 Signed-off-by: Liang Ding <liang.ding@intel.com>
2019-09-18Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 68e63a8ec4794aa297de5131ff919a330b2f564c - Merge "Updated SDK deployment.yaml" - Updated SDK deployment.yaml Issue-ID: PORTAL-727 Signed-off-by: Welch, Lorraine (lb2391) <lb2391@att.com> Change-Id: Ic9041f4a0263c7ab6d36176708323dd47c89bf7d Signed-off-by: Welch, Lorraine (lb2391) <lb2391@att.com>
2019-09-18Update git submodulesBrian Freeman1-0/+0
* Update docs/submodules/oom.git from branch 'master' to ecb82cb18c9560686dd3477a1b05d470464d4636 - Merge "HTTPS calls for sdc" - HTTPS calls for sdc Proper configuration for HTTPS in the sdc: -configured the livenessProbe/readinessProbe ports -changed mount path for dcea-be components -updated dcea component images -updated VID and Portal to talk with the SDC Change-Id: Ibdece8f095aaa79e326cb9c4510e8227a7856b15 Issue-ID: SDC-2548 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
2019-09-18Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 0a492313bb9f3a7fba44e020f74c73d55b3475db - Merge "fix pax config mountpath" - fix pax config mountpath org.ops4j.pax.logging.cfg should mount on /opt/onap/appc,not mount from /opt/opendaylight - which caused readonly error Issue-ID: APPC-1736 Change-Id: I732b26bb4f6fe6ac6f48771468606af106606e51 Signed-off-by: Taka Cho <takamune.cho@att.com>
2019-09-18Update git submodulesAbdelmuhaimen Seaudi1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 3596c9c7bd07cec36baff189ee9285fa633b2abf - Update git submodules * Update kubernetes/robot from branch 'master' to 1d36d59796cf69d8bba1d833a7faa2709bef531c - Add instantiate VLB CDS to Demo Robot Script Issue-ID: TEST-194 Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com> Change-Id: Id7efda3b6e8c03a336005b317365e50fa97651f5
2019-09-18Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 596b8530ed89620ef756647a04b67f6e23e0067d - Merge "Update VID values.yaml to version 5.0.3" - Update VID values.yaml to version 5.0.3 ✔ El-Alto second wave 2.0 Issue-ID: VID-641 Change-Id: Ic35684d4c3198c0a415739f0727808f07afa241c Signed-off-by: Ittay Stern <ittay.stern@att.com>
2019-09-18Update git submodulesjhh1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 1d27d25cfce9639d25cab8b8c579a79261fba7d4 - Update legacy PAP released image Issue-ID: POLICY-1892 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I9fa307bac87fd59156dba7af17a7a8e3c18c4b13