summaryrefslogtreecommitdiffstats
path: root/docs/submodules
AgeCommit message (Collapse)AuthorFilesLines
2020-03-26Update git submodulesHagop Bozawglanian1-0/+0
* Update docs/submodules/vnfrqts/requirements.git from branch 'master' to c881fe779e0500255f6c19fc7aa1055eb1ecb961 - Merge "Fixed PublishEventBatch diagram in VES spec" - Fixed PublishEventBatch diagram in VES spec Since we no longer have the source images, I've converted them to either diagrams generated from Sphinx plugins or simple text representations. Issue-ID: VNFRQTS-862 Signed-off-by: Lovett, Trevor <trevor.lovett@att.com> Change-Id: Iafd346336ca8b5cec71bbeee9fad825da2a5d0bf
2020-03-26Update git submodulesInstrumental1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to 96bf6a2771dfe992fb27bd6361d191d83b6ff605 - AAF Services non root, all platforms adjust Agent for JDK 11 Included redoing Config and Agent Init Containers refit for "hello" (sample) Issue-ID: AAF-1102 Signed-off-by: Instrumental <jgonap@stl.gathman.org> Change-Id: Ia957b1ccce34d164580ccb0a6d02d7b800e4887e
2020-03-26Update git submodulesPamela Dragosh1-0/+0
* Update docs/submodules/policy/engine.git from branch 'master' to c30243bc67f00662612864b6ac2e7a1e958d7fee - Bump engine 1.6.2 patch I'm not going to bother with the other non-pom changes. Until we really need to. Issue-ID: POLICY-2378 Change-Id: Ib06ae950cd37d75fb34f49fd5cb207deca998c11 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-03-26Update git submodulesmrichomme1-0/+0
* Update docs/submodules/oom.git from branch 'master' to f645f0ef1cb04f856ac3a47024e3f1485682fb17 - Update git submodules * Update kubernetes/robot from branch 'master' to 656326e3073f9f8fd4139bb1e585722d8025cb75 - Adapt NBI robot healthcheck to HTTPS Issue-ID: EXTAPI-415 Signed-off-by: mrichomme <morgan.richomme@orange.com> Change-Id: I9caaf093c56bf6a6b0d7564dca7485cec811cb22
2020-03-26Update git submodulesk.kedron1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to a22105ea1e73575bd312450956e6cb6cb51b93a9 - Updated the sdc cert Issue-ID: SDC-2855 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I1ee3f155ca50edee4a47b8585d95f9a3f848b94a
2020-03-26Update git submodulesk.kedron1-0/+0
* Update docs/submodules/sdc/sdc-workflow-designer.git from branch 'master' to a934fc94485008bf14727cc33268c54ff8b6b980 - Updated the sdc cert. Issue-ID: SDC-2855 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: Iab5a9641e0e6e9892dc62e0b3e5ebf07494b714c
2020-03-26Update git submodulesvrvarma1-0/+0
* Update docs/submodules/optf/cmso.git from branch 'master' to 5debbd92e089afe66915ecd42f80216dfa7c8f5f - Fix optf-cmso clm and sonar reports Change-Id: I9a818d717667290c8794ed055191fc24adedb68b Signed-off-by: vrvarma <vikas.varma@att.com> Issue-ID: OPTFRA-694
2020-03-26Update git submodulesAndy Mayer1-0/+0
* Update docs/submodules/externalapi/nbi.git from branch 'master' to 9f66a815c61a63127617c5291812189e0b09eb56 - Merge "Fix NBI standalone HTTP CSIT" - Fix NBI standalone HTTP CSIT Issue-ID: EXTAPI-419 Signed-off-by: aosull01 <adrian.osullivan@huawei.com> Change-Id: I6a22af78e4ebd77cd6d5e8a8fd0e3a6f222dcf37
2020-03-26Update git submodulesJimmy Forsyth1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 24ae34884336d500a97ba24fa0e9cea670a2abf0 - Update git submodules * Update kubernetes/aai from branch 'master' to 19dac30852f1dcde2fbebbacad15852c8a9b1f34 - Replace expiring AAF cert Issue-ID: AAI-2842 Change-Id: I9c55ea4c472692bf3c335f277ff78834831c842b Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2020-03-26Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 61dcaf5ac9612e12332a040c7763d38d7d090498 - Merge "[APPC] Use faster version of common secret templates" - [APPC] Use faster version of common secret templates Issue-ID: OOM-2051 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: I8b6d8f649d8ae45d232cd853f4f194534f8031cf
2020-03-26Update git submodulesmaopeng zhang1-0/+0
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master' to 023ce1b538474ee9502d4fa01b5807326cb8d193 - Merge "Publish vfc-nslcm release version of 1.3.8" - Publish vfc-nslcm release version of 1.3.8 Change-Id: Ieffe9d5064cece4f133ef26a665209d28d10526c Issue-ID: VFC-1638 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2020-03-26Update git submodulesBogumil Zebek1-0/+0
* Update docs/submodules/aaf/certservice.git from branch 'master' to 483ccbf2d8f0c71ebb15a4a47246a68a42e68f3e - Documentation Issue-ID: AAF-1091 Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com> Change-Id: I59df0545c4dd5adfde32c83988f89cd2d0c4676b
2020-03-26Update git submodulesMatthieu Geerebaert1-0/+0
* Update docs/submodules/externalapi/nbi.git from branch 'master' to 29210e6702347d26f5784dd69a40b70042e8ff28 - Remove dead code around ssl support & activate tomcat port log Log INFO: o.s.b.w.embedded.tomcat.TomcatWebServer : Tomcat initialized with port(s): 8443 (https) Change-Id: Iae79e7fbc1ea104afe881dcfbcff294d3938ec38 Issue-ID: EXTAPI-418 Signed-off-by: MatthieuGeerebaert <matthieu.geerebaert@orange.com>
2020-03-26Update git submodulesmaopeng zhang1-0/+0
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master' to 1a84670fab101012c77a604d00ee9b55043eaac6 - Merge "Update nslcm release version to 1.3.8" - Update nslcm release version to 1.3.8 Change-Id: I74ceec4b1e81fd81c1ffe4599b5771e255e2874a Issue-ID: VFC-1626 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2020-03-26Update git submodulesmaopeng zhang1-0/+0
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master' to 611be312bf3aa3d44edd73aad398408fd86feddd - Merge "Update vfc doc" - Update vfc doc Change-Id: I12804ddb38c0360d122dc7f46605303ce66dadc6 Issue-ID: VFC-1648 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2020-03-26Update git submodulesyangyan1-0/+0
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master' to 15ac8700a7a5c383d035c43d50b4a4d4daa3e56c - Update code about ns_vnf serializer Change-Id: Ibb4434a120c0ab0f4aa090bbf4a0355edca9686f Issue-ID: VFC-1651 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2020-03-26Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 0ea78af576105facd35ad4747537ca96d0b08139 - Merge "[VFC] Use faster version of common secret template" - [VFC] Use faster version of common secret template Issue-ID: OOM-2051 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: I26c3b15e837ead96477d95312cb450a623ec16ae
2020-03-26Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to e984935a83dac00dfaef71ce910dad93493e138c - Merge "[PORTAL] Use faster version of common secret template" - [PORTAL] Use faster version of common secret template Issue-ID: OOM-2051 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: Ieb4027d738041e1bd8d8238b74c3615dce2971eb
2020-03-26Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 127a91ed7efc1db32abbe92ddd9510d49ba90c1c - Merge "[NBI] Use faster version of common secret template" - [NBI] Use faster version of common secret template Issue-ID: OOM-2051 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: I84509f2b6eb04585055bb7a5b0cfd957785f53fb
2020-03-26Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 98bd3e1fcfb1c9a92657ff9b31790676f794b9e9 - Merge "[CDS] Use faster version of common secret template" - [CDS] Use faster version of common secret template Issue-ID: OOM-2051 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: Ic54ae02070aad1ce5320cb319681c3c85271699b
2020-03-26Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to f762add5d044bae4532f86629c77281fe80e6ded - Merge "[DCAEMOD] Use faster version of common secret template" - [DCAEMOD] Use faster version of common secret template Issue-ID: OOM-2051 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: I0b497c942fed2d7f2e218b3879117ac272828d73
2020-03-26Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to f26caa523f2d6463fe7514157b82bda6acba4b06 - Merge "[SO] Use common secret template in so-sdnc-adapter" - [SO] Use common secret template in so-sdnc-adapter Use common secret template in so-sdnc-adapter component. For now passwords are stil hardcoded but this will be removed in further commits. Issue-ID: OOM-2328 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: I57c88fcdbaded8fc73fd066f39519be0eae3d670
2020-03-26Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 75be7058a167a603be92aa2de4e027dbe4780a90 - Merge "[SO] Use common secret template in so-sdc-controller" - [SO] Use common secret template in so-sdc-controller Use common secret template in so-sdc-controller component. For now passwords are stil hardcoded but this will be removed in further commits. Issue-ID: OOM-2328 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: I87439d4a4fe545610a2d423180530d57c09ff376
2020-03-26Update git submodulesIttay Stern1-0/+0
* Update docs/submodules/vid.git from branch 'master' to 6ffdec2e4c70db07fa598eb9612d2c8124a29ccc - Merge "Revert "VNF's LCP regions found by Line-of-business (and owning-entity)" This reverts commit e2a7abb45b953d405fc5aa1917f74e2da9f188c0." - Revert "VNF's LCP regions found by Line-of-business (and owning-entity)" This reverts commit e2a7abb45b953d405fc5aa1917f74e2da9f188c0. Issue-ID: VID-788 Change-Id: I72fb7ab9d19df9157c25f635188cb3d0b1fda2cb Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
2020-03-26Update git submodulesvasraz1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 9f8477bc49755f9b1e417266624bbc04958e8b9b - Increase test coverage Change-Id: Ie28e36012be1313efa0082b34c0b36c325dc1b76 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2833
2020-03-26Update git submodulesvasraz1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 29ef7edbf694dea1a33a7ddd97b7250d2ec1f61e - Increase test coverage Change-Id: I90606d768c55ad13aa9df62bc4d3f533206db1bc Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2833
2020-03-26Update git submodulesShankaranarayanan Puzhavakath Narayanan1-0/+0
* Update docs/submodules/optf/osdf.git from branch 'master' to dabbcaa94ac5bb2bbc1f7af0cc6404ae9ef900ad - Merge "Increment optf-osdf release version to 2.0.1" - Increment optf-osdf release version to 2.0.1 Change-Id: I1e717d9d8e04c6d35e72d89c5e6ae03df5e0de2a Signed-off-by: vrvarma <vikas.varma@att.com> Issue-ID: OPTFRA-727
2020-03-26Update git submodulesChuanyu Chen1-0/+0
* Update docs/submodules/so.git from branch 'master' to 79d1e0244ce1f01f76640491dd6fca23420212cd - Merge "Fix PNF software upgrade workflow" - Fix PNF software upgrade workflow Fix the issue that API can not return when the workflow has ended. Issue-ID: SO-2751 Signed-off-by: Enbo Wang <wangenbo@huawei.com> Change-Id: I7d140b2286ce3003a6efcd2c3891fc8142982477
2020-03-26Update git submodulesPamela Dragosh1-0/+0
* Update docs/submodules/policy/engine.git from branch 'master' to 7f9b4eeaf8d19d04bc53647a4abfd174ae233a6d - Release engine 1.6.1 docker Issue-ID: POLICY-2378 Change-Id: I81ecd9eb4e26d4e51b52b4fd4dc7663555468444 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-03-26Update git submodulesHagop Bozawglanian1-0/+0
* Update docs/submodules/vnfrqts/requirements.git from branch 'master' to 096bef947351a1f76986b09121b12a371ca010ca - VNFRQTS - Fixing the metadata Issue-ID: VNFRQTS-865 Signed-off-by: Hagop Bozawglanian <hagop.bozawglanian@att.com> Change-Id: Iec1acf68d5ffbde95c275ee951f29c69f964538f
2020-03-26Update git submodulesPamela Dragosh1-0/+0
* Update docs/submodules/policy/engine.git from branch 'master' to 9af888cc263c9f30ce7a2af49fe3dcda1899f3ab - Release engine 1.6.1 artifacts Issue-ID: POLICY-2378 Change-Id: Ib18bd384cd600492c7de0bd03d4738721e15f560 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-03-25Update git submodulesPamela Dragosh1-0/+0
* Update docs/submodules/policy/engine.git from branch 'master' to c4010ab7cc1f94c826b04f80e672f3042834bfc1 - Point to released artifacts 1.6.0 is drools-app 2.2.2 is models Issue-ID: POLICY-2378 Change-Id: I4329d433104e814ae023ee624442c79eb5eed3df Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-03-25Update git submodulesIttay Stern1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 78942175bc10ad05bd7b2005accaa9ea78a0cdb8 - VID: Update to version 6.0.4 (Frankfurt RC3) This build handle DB password special characters Issue-ID: VID-786 Issue-ID: VID-779 Change-Id: I48f3da564d1ea9314cb779021438241dd6113ba1 Signed-off-by: Ittay Stern <ittay.stern@att.com>
2020-03-25Update git submodulesTschaen, Brendan1-0/+0
* Update docs/submodules/music.git from branch 'master' to c345abd5168518c3ad2c9f5f6eeb352b788b5440 - Bump up to 3.2.38 Issue-ID: MUSIC-561 Signed-off-by: Tschaen, Brendan <ctschaen@att.com> Change-Id: Icb1aa14b82019a4ebd43543d2250cd665b387399
2020-03-25Update git submodulessu622b1-0/+0
* Update docs/submodules/dmaap/messagerouter/messageservice.git from branch 'master' to d743ca85c2e01d5f516c52a2ee8399519b945e1d - release message router image Issue-ID: DMAAP-1411 Change-Id: Iaa2a0982404fffcc2f3caf89b8ed9564319f1c44 Signed-off-by: su622b <su622b@att.com>
2020-03-25Update git submodulesAlexey Sandler1-0/+0
* Update docs/submodules/vid.git from branch 'master' to e53d09ea02e5f1cfcff0b7614a5e69effaa707a7 - add tenantId and lcpCloudRegion to vfm instance during delete vfm during delete vfm get tenantId and lcpCloudRegion from parent vnf and them to vfm instance Issue-ID: VID-795 Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com> Change-Id: I66969f936e8cd5fa4e9867decebadd28186a1851 Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
2020-03-25Update git submodulessu622b1-0/+0
* Update docs/submodules/dmaap/messagerouter/messageservice.git from branch 'master' to 1b9aba0ddcc14edd08d69e8530d24c173127b441 - update cert Issue-ID: DMAAP-1411 Change-Id: Id5228e5957dd970f38d61d946461308be95ae2fc Signed-off-by: su622b <su622b@att.com>
2020-03-25Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 72c6cdcaa3319e40a881c1f0d8a2b1f72fdf56dc - Merge "Release Frankfurt 5.0.0" - Release Frankfurt 5.0.0 Release Frankfurt 5.0.0 images and jar Issue-ID: CLAMP-795 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ic3de4b22f211f696bbef1048dab885edc8e438a7
2020-03-25Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 2abc42412643a5d7736fc5c6ba108eaf3473c263 - Merge "Release Frankfurt 5.0.0" - Release Frankfurt 5.0.0 Release Frankfurt 5.0.0 images and jar Issue-ID: CLAMP-795 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I303b8f189a3ed761ac09f7e567f5eeddaf5bc245
2020-03-25Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to f5420060c758308df18a0e316d6ae214ef9eb5c6 - Merge "split modification to flyscript into separate file" - split modification to flyscript into separate file split modification to flyscript into separate file Issue-ID: SO-2764 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: Id6506ee9fd0411d3ff89e7b4fe2af0af0dd39524
2020-03-25Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to eb11d1d089cfe5d03e54dee1fced5f96372afe0b - Merge "Ingest and Process Service Function" - Ingest and Process Service Function Intial commit of writing service function to AAI Update schema.sql table to pass all unit tests Update local sql to setup CI server for test Update schema to work and fix passwords Issue-ID: SO-2763 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I8c517a485841574cde849e1c4e86c3bb7b7dcf89
2020-03-25Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 8bc5d2e944f99e705cbf990bb44ce66674ebef98 - Merge "Use setVariablesLocal for setting task variables" - Use setVariablesLocal for setting task variables Use setVariablesLocal for setting task variables in a correct scope in Camunda. Wait for task to be created before query to address robot test slowdown. Issue-ID: SO-2761 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I8229326f48936dc4bc59162341c12355a64982a5
2020-03-25Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 47e74ec900616c7afc2a81f4851ea2b557be0abd - Merge "Update Subprocess to use COMPLETE status" - Update Subprocess to use COMPLETE status Update Subprocess to use COMPLETE status Update Subprocess to use COMPLETE status Fix column name to be request_status Issue-ID: SO-2762 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I8307524b3c226a25795247a47c95753b150076fe
2020-03-25Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to b0bb4733ee29dabfe024dc93869a2ede09ef010f - Merge "mso to add support for creating the cloud region" - mso to add support for creating the cloud region mso to add support for creating the cloud region Updated tag name to msoRequest on deletes. Issue-ID: SO-2753 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I80e318ce34f5938a42896398eb1a38b5c5f6e831
2020-03-25Update git submodulesTschaen, Brendan1-0/+0
* Update docs/submodules/music.git from branch 'master' to a6056f7344c2e7adebc651ea63c4e9d2d070172b - Force exclusion of jsr311 Building the container from the ONAP Jenkins job pulls in this library, even though it is not a dependency according to maven Issue-ID: MUSIC-561 Signed-off-by: Tschaen, Brendan <ctschaen@att.com> Change-Id: I966bfffe22cc57264091eddaa0480d6582369b66
2020-03-25Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to a55638c236911d95ea0123a32321fcd9ed663fec - Merge "Fix the stage builds" - Fix the stage builds Fix the stage build docker due to a bad groovy execution Issue-ID: CLAMP-793 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I531fbb03a2fc0eddd26c04d9b690ba4ca059ae64
2020-03-25Update git submodulesDarraghEgan1-0/+0
* Update docs/submodules/integration.git from branch 'master' to 78f8d30c96ae934cf170f7646057ce7e8e54a401 - [INT-1450] : Documentation of PNF Software Upgrade This contains documentation for PNF Software Upgrade using Ansible protocol with EM Issue-ID: INT-1450 Signed-off-by: Darragh Egan <darragh.egan@est.tech> Change-Id: Ib5385e690c9f6cff7fc2b2251181054dacba777f
2020-03-25Update git submodulesDarraghEgan1-0/+0
* Update docs/submodules/integration.git from branch 'master' to ef648d52e53e36b735e97dd40788c9e27d90100f - [INT-1450] : Documentation of PNF Software Upgrade This contains documentation for PNF Software Upgrade using Netconf/Yang interface with EM Issue-ID: INT-1450 Signed-off-by: Darragh Egan <darragh.egan@est.tech> Change-Id: I8a225b5a4b08de2004ff327148fadfff8976c5de
2020-03-25Update git submodulesBartek Grzybowski1-0/+0
* Update docs/submodules/integration.git from branch 'master' to 9148cc289f479dd535844c819bdabcf80718305b - Add 'build' target for 'sslendpoints' project To follow a common protocol of testing Golang based applications in CI we need a 'build' target for doing a local (non-docker) build to verify 'go build' routine. It's however not added to "all" target as that one already references docker based build by default. Change-Id: I2e380ef09a1ae18456d7288f853d085617149338 Issue-ID: SECCOM-261 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
2020-03-25Update git submodulesandreasgeissler1-0/+0
* Update docs/submodules/integration.git from branch 'master' to ef0371c50a1d1006f580f0392eeb42ce54f82446 - corrected the hardcoded DB pod-names Issue-ID: INT-1484 Signed-off-by: andreasgeissler <andreas-geissler@telekom.de> Change-Id: I7f1670a79db751087f722a1196e2de23448f7a2a