summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2020-03-04Update git submodulesRemigiusz Janeczek1-0/+0
* Update docs/submodules/aaf/certservice.git from branch 'master' to d5aa15227f0c8a8bd57b668fdc25eb3935be81c5 - Fix PrivateKey encoding in certservice-client, refactor CsrFactory Add PrivateKeyToPemEncoder with tests Refactor CsrFactory to return not encoded PEM string (less responsibility and easier to test later) Issue-ID: AAF-996 Change-Id: Ia8124d43ef7fb8b1d3077c98929c52f30b6512c6 Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
2020-03-04Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to f0e00e7c9ea8dd15a4aacdd880aa648539caf087 - Merge "Update UI to define Pdp Group" - Update UI to define Pdp Group Update teh UI, adding the possibilities to define Pdp Group and Pdp Subgroup info. Issue-ID: CLAMP-654 Change-Id: I3660c491d3a4c730a7414f9c6de9e3859f3c3601 Signed-off-by: xuegao <xg353y@intl.att.com>
2020-03-04Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 993bd35cd7b0768201ffcab9b6dab7b9f6ed3711 - [AAF] more memory for SMS SMS requests/limits were set too low and thus it prevents start when on small flavors Issue-ID: AAF-1105 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: Ib591c972ceaa4186dd16ca5cebd86b58c0288718
2020-03-04Update git submodulesSeshu Kumar M1-0/+0
* Update docs/submodules/so.git from branch 'master' to 97e7341e1206442f286900a3441bda96430e43b3 - Merge "Add unit test for DoCreateCommunicationService workflow" - Add unit test for DoCreateCommunicationService workflow Issue-ID: SO-2368 Change-Id: Ibaf868c2e7c0dc281da14cafe8dacf03330da951 Signed-off-by: hetengjiao <hetengjiao@chinamobile.com>
2020-03-04Update git submodulesSeshu Kumar M1-0/+0
* Update docs/submodules/so.git from branch 'master' to 9280a9940aec1eabac3a2b202a9e3bae219053a1 - Merge "Add scripts for DoCreateCommunicationService workflow" - Add scripts for DoCreateCommunicationService workflow Issue-ID: SO-2368 Change-Id: Ib1c447f903f63d89be8af4012ee4e23e75b8a802 Signed-off-by: hetengjiao <hetengjiao@chinamobile.com>
2020-03-04Update git submoduleshetengjiao1-0/+0
* Update docs/submodules/so.git from branch 'master' to 934a37f12ee98a8e9972e3d749d70d7407705032 - Add Unit Test for Create Communication Service workflow Issue-ID: SO-2368 Change-Id: Id08ea8dc494488aeac58597f6db6ffc684652e59 Signed-off-by: hetengjiao <hetengjiao@chinamobile.com> - Add scripts for Create Communication Service workflow Issue-ID: SO-2368 Change-Id: I9cda045960a1db582c309acf302e33dec0297b4b Signed-off-by: hetengjiao <hetengjiao@chinamobile.com>
2020-03-04Update git submodulesk.kedron1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to ffeb962c707caf38b3eaf3ff1fc18bf1b1c8ef54 - Fixed the navbar style Now all time contains all elements in the one line. Issue-ID: SDC-2308 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: Ic424f6bef0bc2ba83375b1339bbc451bd14ddff9
2020-03-04Update git submodulesIttay Stern1-0/+0
* Update docs/submodules/vid.git from branch 'master' to 03658e97c41cce22f20ac04d69038103089b4f05 - Upgrade AAI API version to v16 v16 is the recommended Dublin version: https://wiki.onap.org/display/DW/AAI+REST+API+Documentation+-+Dublin Issue-ID: VID-365 Change-Id: I3c84525382477d453dcdc0e5c1e061dc41526dc0 Signed-off-by: Ittay Stern <ittay.stern@att.com>
2020-03-04Update git submodulesAmichai Hemli1-0/+0
* Update docs/submodules/vid.git from branch 'master' to 2b0c105bd2316f43f4a66d2500f3d2410c33ef69 - Merge "Document SDNC https port 30267" - Document SDNC https port 30267 Clear http 30202 port removed. See https://wiki.onap.org/display/DW/OOM+NodePort+List Issue-ID: VID-773 Change-Id: Iba1712b837870ecfcc17cf6420902cc3b41a5983 Signed-off-by: Ittay Stern <ittay.stern@att.com>
2020-03-04Update git submodulesAmichai Hemli1-0/+0
* Update docs/submodules/vid.git from branch 'master' to 4b13feba8d9b64b949c597910bfe980a991c67fa - Merge "Remove explicit org.apache.httpcomponents.httpcore" - Remove explicit org.apache.httpcomponents.httpcore It is brought inherently by org.apache.httpcomponents.httpclient Issue-ID: VID-755 Change-Id: I4582bc0ca8a4be0642d2e47ce6c50d466101cc68 Signed-off-by: Ittay Stern <ittay.stern@att.com>
2020-03-04Update git submodulesMichaelMorris1-0/+0
* Update docs/submodules/sdc/sdc-docker-base.git from branch 'master' to c24a99fd6ec727d4fc95fa656cbe2bf221a3b3aa - Fix failing base_sdc-cassandra image build Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-2774 Change-Id: Ifca72e2c06b55eb4b5a467577bea2bed7e15dd5c
2020-03-04Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 1949f1bf2bdd37185d33ed587685f2027a760eb4 - Merge "Replaced URLs from the configuration file with test values" - Replaced URLs from the configuration file with test values Also, the last patch seems to have required the server_url attribute in section [sdnc] to be avaiable. This is why instead of 'removing', I'm replacing the unused/unwanted URL Issue-ID: OPTFRA-699 Signed-off-by: Ikramullah, Ikram <ikram@research.att.com> Change-Id: I2365439ae013b7b4331741cd26b66e9b59f4d864
2020-03-04Update git submodulesChuanyu Chen1-0/+0
* Update docs/submodules/so.git from branch 'master' to 7e0be6c64f18111382803cbd7baf485bbd42e2c8 - Merge "Add Create Communication Service workflow" - Add Create Communication Service workflow Issue-ID: SO-2368 Change-Id: I6ce7a8e2af31dce192468ab73247c53156183524 Signed-off-by: hetengjiao <hetengjiao@chinamobile.com>
2020-03-04Update git submodulesChuanyu Chen1-0/+0
* Update docs/submodules/so.git from branch 'master' to 4a297fc5c67f4f2b27e93916a193c7cb12e32d3c - Merge "Add ActivateSliceService workflow" - Add ActivateSliceService workflow Issue-ID: SO-2368 Change-Id: Ia6ba48652c08b4beade525975008ee8f303666cf Signed-off-by: hetengjiao <hetengjiao@chinamobile.com>
2020-03-04Update git submodulesChuanyu Chen1-0/+0
* Update docs/submodules/so.git from branch 'master' to ca51c3ef602e32a851ad7c6ae27ff2c3d9028c82 - Merge "Add scripts for ActivateSliceService workflow" - Add scripts for ActivateSliceService workflow Issue-ID: SO-2368 Change-Id: I537dc0be5b4a483ef67ff838d9659d809f244225 Signed-off-by: hetengjiao <hetengjiao@chinamobile.com>
2020-03-04Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 6be6343538d8ad20ed4bf2f8f077c831abcc0a3b - Merge "ES non-root" - ES non-root ElasticSearch run as non-root user Issue-ID: CLAMP-668 Change-Id: I786e2ff8babf4b78fa6dfdf63ff9cd486099fbac Signed-off-by: osgn422w <gervais-martial.ngueko@intl.att.com>
2020-03-04Update git submodulesReshmasree1-0/+0
* Update docs/submodules/integration.git from branch 'master' to b376a8b8f058800ba375ad481a213e02d662f89e - Update OOF SON use case documentation Issue-ID: INT-1466 Signed-off-by: Reshmasree <reshmasree.chamarthi2@wipro.com> Change-Id: I9d2dfac1d7244971553f79359466b2b3c104066d
2020-03-04Update git submodulesReshmasree1-0/+0
* Update docs/submodules/integration.git from branch 'master' to b6ce5a13aaf526cb14be4430a51ba120b7715709 - Update E2E Network Slicing use case documentation Issue-ID: INT-1468 Signed-off-by: Reshmasree <reshmasree.chamarthi2@wipro.com> Change-Id: Ib7a1a363910594eea5fb85460a98478a36510dbf
2020-03-04Update git submodulesebo1-0/+0
* Update docs/submodules/integration.git from branch 'master' to 080e04538cbaff52dc46c0b3208b9f60f3479ba7 - Fixed the SSH configuration of user 'netconf' The actual SSH configuration is stored in Sysrepo and not as ordinary ~netconf/.ssh files. Issue-ID: INT-1124 Change-Id: I7e16e09a20ac6f2d52c8958550603935b6790283 Signed-off-by: ebo <eliezio.oliveira@est.tech>
2020-03-04Update git submodulesChuanyu Chen1-0/+0
* Update docs/submodules/so.git from branch 'master' to 430b72105cfed5e3e427dad508cfddb97b9068bc - Merge "Add service beans in bpmn" - Add service beans in bpmn Issue-ID: SO-2368 Signed-off-by: zm330 <zhangminyj@chinamobile.com> Change-Id: I64cfa0cbb55a6609289fba70b2419dd628583ad5
2020-03-04Update git submodulesChuanyu Chen1-0/+0
* Update docs/submodules/so.git from branch 'master' to 2505c09848cf548d20bc53970c114c5a94c7f42d - Merge "Add method to prepare OOF request body for NST selection" - Add method to prepare OOF request body for NST selection Issue-ID: SO-2368 Change-Id: I2dcc8a0a439ba87d461b96460780bd4c43d13c26 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2020-03-04Update git submodulesChuanyu Chen1-0/+0
* Update docs/submodules/so.git from branch 'master' to 7efebc4bbf823699b8462636a58b0af09520e1e6 - Merge "Add groovy for CreateSliceService" - Add groovy for CreateSliceService Issue-ID: SO-2368 Change-Id: If082bd17356cf9ee978c0d11cb5b35191ee9f429 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2020-03-04Update git submodulesChuanyu Chen1-0/+0
* Update docs/submodules/so.git from branch 'master' to f1b5fbfa84766e5f9223f349a83dc25754df6d23 - Merge "Modify NSMF beans" - Modify NSMF beans Issue-ID: SO-2368 Change-Id: I2dd03b364d53fe18d0672b537e5287b2597a81d9 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2020-03-04Update git submodulesBogumil Zebek1-0/+0
* Update docs/submodules/aaf/certservice.git from branch 'master' to 1d535a1b38e26c7035db2bde7405261d97bf7261 - Merge "Transform pem files into pkcs12" - Transform pem files into pkcs12 Transform from received from CertService pem files into pkcs12 Issue-ID: AAF-996 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com> Change-Id: I39b71cf3f267c5ca701b3d4cf456fc6d81ae5f81
2020-03-04Update git submodulesKanagaraj Manickam1-0/+0
* Update docs/submodules/cli.git from branch 'master' to 92d3092901ab1866766953e5f8d74bacf27bbc8f - Version 5.0.0 Issue-ID: CLI-249 Change-Id: If6347fcc3e94725364d7bf438d85534a43ac353c Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
2020-03-04Update git submodulesAvdhut Kholkar1-0/+0
* Update docs/submodules/logging-analytics.git from branch 'master' to 7748e30556c68e710832e5f1612f9c5c7e3a854e - Merge "Added new annotation for ScheduledLogging" - Added new annotation for ScheduledLogging Issue-ID: LOG-1208 Change-Id: If6d8f8c18affcec8a11eab877f6f716ed34909ba Signed-off-by: Brittany Plummer (bp896r) <bp896r@att.com>
2020-03-04Update git submodulesgummar1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to da1303759f22b7882b46fb8670704f2770bf46ed - Fix case for all Software upgrade actions Issue-ID: CCSDK-2145 Signed-off-by: gummar <raj.gumma@est.tech> Change-Id: Ie2a6b6c72997be65ac304f6cd1daac3a8aa85480
2020-03-04Update git submoduleshetengjiao1-0/+0
* Update docs/submodules/so.git from branch 'master' to 7428cbf2dfff3b3ec2c4732de5499809bf0dc3d6 - Add DoCreateCommunicationService workflow bpmn Issue-ID: SO-2368 Change-Id: Iee4d4c937947d01196a85c8a45387c5a3cb0aa19 Signed-off-by: hetengjiao <hetengjiao@chinamobile.com>
2020-03-04Update git submodulesJessica Wagantall1-0/+0
* Update docs/submodules/modeling/etsicatalog.git from branch 'master' to 1a1e716e6cecb83655e4dde747e5f18331254855 - Migrate modeling-etsicatalog docs Merging this will create https://onap-modeling-etsicatalog.readthedocs.io This build will run in parallel to the current docs generation method until we are ready to cut over. Issue-ID: CIMAN-364 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: I2c9017f1966cc53f22d30a00f8db62560087f8d0
2020-03-04Update git submodulesyangyan1-0/+0
* Update docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git from branch 'master' to 175d40f9f66838825208cd213b53de207294694b - Change svnfm of huawei pod startup to non root Change-Id: Iafe6f0dee6f89a34a76b403d4ded0f5d8e03f744 Issue-ID: VFC-1637 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2020-03-04Update git submodulesHui Deng1-0/+0
* Update docs/submodules/modeling/modelspec.git from branch 'master' to 9e24ecc370062ef3c7a080141bc1028b61006d49 - Merge "Migrate modeling-modelspec docs" - Migrate modeling-modelspec docs Merging this will create https://onap-modeling-modelspec.readthedocs.io This build will run in parallel to the current docs generation method until we are ready to cut over. Issue-ID: CIMAN-364 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: Ia85ec71d6a14b66479293a167b108b27c4f74990
2020-03-04Update git submodulesrajeevme1-0/+0
* Update docs/submodules/aai/sparky-be.git from branch 'master' to c4fe01668d4472c978ca220bdfff9c8e15bc8027 - [AAI-2531] | Update springboot to 2.1.12.RELEASE Issue-ID: AAI-2531 Change-Id: I5cd738c8786753c4ecbfc4cb23a051978466e256 Signed-off-by: rajeevme<rajeev.mehta@amdocs.com>
2020-03-04Update git submodulesHarish Venkata Kajur1-0/+0
* Update docs/submodules/aai/aai-common.git from branch 'master' to 6f0577db0cc8bd169d5d420e22b576397817f8bd - Update aai-common to be spring boot 2 compatible Issue-ID: AAI-2806 Change-Id: Idad79373209ef25bb26551253aa8ad86e4a75549 Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
2020-03-04Update git submodulesSeshu Kumar M1-0/+0
* Update docs/submodules/so.git from branch 'master' to f2c39570e2d1f602e72b169ebf796b93d162b3c4 - Merge "Added AAF SSL certs related changes" - Added AAF SSL certs related changes Removed client certs from the docker image. These client certs will be mounted on the docker image using helm charts. This will allow helm users to manage AAF credentials using the keyfile available in SO OOM for CADI AAF feature. Issue-ID: SO-2451 Signed-off-by: Ramesh Parthasarathy(rp6768)<ramesh.parthasarathy@att.com> Change-Id: I03efc6ad279f0eaf6773b0ddd42ab43fc053e424
2020-03-04Update git submodulesRajamohan Raj1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to 37aed9b7a0db62b9931d89c614ff6291cc4608cc - Implemented AppIntents and GenPlaceIntents Implemented the routes for creating, getting, and deleting generic placement intents and App intents. Issue-ID: MULTICLOUD-875 Signed-off-by: Rajamohan Raj <rajamohan.raj@intel.com> Change-Id: Iecb11c442958a43a517772e066de45213e3d7030
2020-03-03Update git submodulesTrevor Lovett1-0/+0
* Update docs/submodules/vnfrqts/requirements.git from branch 'master' to ed541ef354ab8f6c5049d81d7cb701e70bab3bd9 - Merge "Migrate vnfrqts-requirements docs" - Migrate vnfrqts-requirements docs Merging this will create https://onap-vnfrqts-requirements.readthedocs.io This build will run in parallel to the current docs generation method until we are ready to cut over. Issue-ID: CIMAN-364 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: I1a83b351ba9f94946cc6d0f9cea3d90c801b8e65
2020-03-03Update git submodulesJessica Wagantall1-0/+0
* Update docs/submodules/vnfrqts/guidelines.git from branch 'master' to 7ed04df011e1bd9abd4a5f10cf8743f34a39496f - Migrate vnfrqts-guidelines docs Merging this will create https://onap-vnfrqts-guidelines.readthedocs.io This build will run in parallel to the current docs generation method until we are ready to cut over. Issue-ID: CIMAN-364 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: I312aa278cd6a186bd0308cd2032482932931dd40
2020-03-03Update git submodulesJack Lucas1-0/+0
* Update docs/submodules/ccsdk/dashboard.git from branch 'master' to 9b4e4123f15ad9000fafb143f502bb3fac71172d - Merge "release 1.3.1 dashboard container" - release 1.3.1 dashboard container Change-Id: I0849c09acd296bb22cd6698f2c3552c932938daa Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com> Issue-ID: DCAEGEN2-1891 Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
2020-03-03Update git submodulesWeberLaurent1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to f0a648cc89cb870a4053d47a06fe2a4a54cc3f1c - Rework tosca converter New code to convert the Policy Tosca Yaml to Json Schema for the Clamp UI Issue-ID: CLAMP-253 Change-Id: I10c1d3d81c5feae402773de94bd88c190ec68645 Signed-off-by: WeberLaurent <weberlaurent23@gmail.com>
2020-03-03Update git submodulesPamela Dragosh1-0/+0
* Update docs/submodules/policy/engine.git from branch 'master' to 4c11f641cc3afb5c99904082f2657d09bcbbab07 - use policy/parent awaitility use common version Issue-ID: POLICY-2381 Change-Id: I2463363beda83aa7ffb584a1f2b487389320c549 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-03-03Update git submodulesByung-Woo Jun1-0/+0
* Update docs/submodules/so.git from branch 'master' to ad6bbf0a02d28af81493f446760e200179405d78 - Merge "fix for SO-2696" - fix for SO-2696 Change-Id: I00199f5d03fe6bdc517578506d4f21cca4d62c56 Issue-ID: SO-2696 Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
2020-03-03Update git submodulesJozsef Csongvai1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 2fce8bf2891f3ce472f4b06d09d0e987fbc44149 - Add properties to ResolutionSummary Also wrapping ResolutionSummary response to ease integration with SDNC. Issue-ID: CCSDK-2038 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: Ic1b8959e22ef795065d37664fb60f100af235a90
2020-03-03Update git submodulesJessica Wagantall1-0/+0
* Update docs/submodules/dmaap/messagerouter/messageservice.git from branch 'master' to 4dd6518e25543b69d4a0673611587b75bba4e4fe - Migrate dmaap-messagerouter-messageservice docs Merging this will create https://onap-dmaap-messagerouter-messageservice.readthedocs.io This build will run in parallel to the current docs generation method until we are ready to cut over. Issue-ID: CIMAN-364 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: I58f59c15f4ea7ae547c4ac184cb6a596f818f91a
2020-03-03Update git submodulesJozsef Csongvai1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to d0e90690108b30b4571a61f987c0d8c7d52df5da - Add override function to BlueprintSvcLogicService Issue-ID: CCSDK-2153 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I58f807fbfea85880f3c2b9443ed62a1d84f0f6bb
2020-03-03Update git submodulesTschaen, Brendan1-0/+0
* Update docs/submodules/music.git from branch 'master' to 84070619f78f98993111d60386a4f05ca2298739 - Servlet library provided Issue-ID: MUSIC-574 Signed-off-by: Tschaen, Brendan <ctschaen@att.com> Change-Id: Ife06b248b03792ff179915074669e1b0bcea2f55
2020-03-03Update git submodulesKotagiri, Ramprasad (rp5662)1-0/+0
* Update docs/submodules/ccsdk/dashboard.git from branch 'master' to 2b94695ad96ad2340da2ff90df44013539d24aea - update version for docker build Issue-ID: DCAEGEN2-2120 Change-Id: Ibfc9cdbd39b2cfeda734cb6d90d626da6f045e46 Signed-off-by: Kotagiri, Ramprasad (rp5662) <rp5662@att.com>
2020-03-03Update git submodulesGervais-Martial Ngueko1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to fb445e11abb3ad59e5e2305b023422e2b4796989 - Merge "Update docker image Update docker base image so that clamp uses the official onap jdk image" - Update docker image Update docker base image so that clamp uses the official onap jdk image Issue-ID: CLAMP-625 Change-Id: I68525be3d6bfbf5dd7c5bcf6d59863df07fd4dd9 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2020-03-03Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 81ff0fba2a1313b51dbf840691addfc4141de571 - Change the user in the frontent Use clamp user instead of root for the frontend nginx Issue-ID: CLAMP-625 Change-Id: I9bd7e3f3d1908c7e22c5435c792910b8245780b4 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2020-03-03Update git submodulesPamela Dragosh1-0/+0
* Update docs/submodules/policy/parent.git from branch 'master' to c0b0ed6664def4ff811dd8d303e605a8e5b44346 - Add awaitility dependency Seems to be used in several repos. This consolidates the version. Issue-ID: POLICY-2381 Change-Id: Iad3bbf8901a117db36da3951a7d5284c000266d6 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-03-03Update git submodulesTomasz Wrobel1-0/+0
* Update docs/submodules/aaf/certservice.git from branch 'master' to 552f87238fbc04b63a992645217dcfded40cb122 - Refactor logger message Issue-ID: AAF-996 Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com> Change-Id: Ifc3ff60b8b5da15bdc904a80b6e80195b7bca0ce