summaryrefslogtreecommitdiffstats
path: root/docs
AgeCommit message (Collapse)AuthorFilesLines
2020-04-07Update git submodulesKanagaraj Manickam1-0/+0
* Update docs/submodules/cli.git from branch 'master' to f325249cbb83e4b4507d385a5813066ca911c154 - Release 5.0.4 container Issue-ID: CLI-255 Change-Id: I38cac8e66d7db31e33f37bf0dee406f3abe97500 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
2020-04-07Update git submodulesAlexey Sandler1-0/+0
* Update docs/submodules/vid.git from branch 'master' to 5a5af80b9f6475b44de3e95ebca8f7fb05d75272 - fix test: wait for aai_get_newest_model_version request been sent this fix resolve the issue that occasionally VFM upgrade tests failed due to aai_get_newest_model_version_by_invariant request not sent Issue-ID: VID-647 Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com> Change-Id: I586677e6003e42cc259543d2902c17b536a65799 Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
2020-04-06Update git submodulesPatrick Brady1-0/+0
* Update docs/submodules/appc.git from branch 'master' to 0234b8a247abc7bc994876569fa929a141a1cbe5 - Activate DGs for CDS POC scaleout Adding the DGs for the CDS POC scaleout to the dg_activate file so they will be marked active in the database. Change-Id: I1a9077bec657c9a868847022f0ab3178c911cef2 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1850
2020-04-06Update git submodulesPatrick Brady1-0/+0
* Update docs/submodules/appc/deployment.git from branch 'master' to 8d65e22d07af8e4bbffa071c49514490ee7f3463 - Change to appc snapshot 1.7.2 Change-Id: I089b7872a9d941d17070fd71c4b68f1debae6974 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1816
2020-04-06Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to bcea64b75f3d8f17759fed3ad7f0051a5874b37c - Merge "Bump up clamp to 5.0.3" - Bump up clamp to 5.0.3 Due to some fixes for policy communication, we have to bump up clamp to 5.0.3 Issue-ID: CLAMP-819 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I46eed4fa23e92002a6b80f4d1b00e5ba27b4edd2
2020-04-06Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 5c76e71e5027dee7a7b3eebe88c5dff6233c0d5b - Merge "[CDS] Correct connection configuration to sdnc" - [CDS] Correct connection configuration to sdnc Issue-ID: INT-1511 Signed-off-by: Konrad Bańka <k.banka@samsung.com> Change-Id: I1642557b2ffbee941dc2865a818ca68e814511a6
2020-04-06Update git submodulesRupinder1-0/+0
* Update docs/submodules/appc.git from branch 'master' to f2a7462d4c7652dec1aa12fac122674be8bc62c3 - improved code structure Removed code smells Issue-ID: APPC-1859 Change-Id: I241ac80a75fdebfb9048349ae993a891a7a9642d Signed-off-by: Rupinder<rupinsi1@in.ibm.com>
2020-04-06Update git submodulesVENKATESH KUMAR1-0/+0
* Update docs/submodules/dcaegen2.git from branch 'master' to c790dcb3bbd3c498e0f838837c212ce185e70da5 - dcae doc cleanup Remove old markdown platform doc Change-Id: I592775a24d17d7d786708cde008703f4d899946c Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-1891 Signed-off-by: VENKATESH KUMAR <vv770d@att.com>
2020-04-06Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 5da97551c766150ac9a88d19f3c8095b236062f6 - Merge "[POLICY] Use common secret template in pap" - [POLICY] Use common secret template in pap Use common secret template in pap module instead of hardcoding them in config map. For now db creds are hardcoded but this will be remove in further commits. Issue-ID: OOM-2342 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: Ic4a4c175579fdc89de216fc09edd562530ad10cc
2020-04-06Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to f033c7c113bf1e2eb82a56c9538c99f0783e3fa3 - Merge "[POLICY] Use common secret template in policy-api" - [POLICY] Use common secret template in policy-api Use common secret template in policy-api module instead of hardcoding db credentials in config map. For now db creds are hardcoded but will be remove in further commits. Issue-ID: OOM-2342 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: I6219a06ef466e214756302974589fcc27fa0a4cd
2020-04-06Update git submodulesSunder Tattavarada1-0/+0
* Update docs/submodules/portal.git from branch 'master' to 3cf023833be095472e708ad8c9c470b077a17d20 - Merge "Portal-BE remove from pom.xml" - Portal-BE remove from pom.xml This patch corrects code coverage in Poral project. Issue-ID: PORTAL-710 Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com> Change-Id: I1e1b2de607bb6344002a885057447d8fec9783d0
2020-04-06Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 0aabd6aa584241efdce457ea4455c49044aefe58 - Merge "execution timeout not respected..." - execution timeout not respected... Issue-ID: CCSDK-2012 rev1: initial commit rev2: reworked + added grpc deadline rev3: wrong err msg.. rev4: timeouts in millis rev5: timeout defaulting was after logging... Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: I02eb414904cc5dfcf51ff7b7552dafe54857ed1e (cherry picked from commit 3f56fcfec7d14e7351280b9e2a1d220638626693)
2020-04-06Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to c40e6e025dd3077b777f31b9858ac78b5eb2493c - Merge "Fix ResolutionSummary - return empty string instead of null" - Fix ResolutionSummary - return empty string instead of null Issue-ID: CCSDK-2246 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I894bf605ee7f5b094d015fd637979ce055da5081
2020-04-06Merge "Add osa to intersphinx inventory"Jessica Wagantall1-0/+1
2020-04-06Add osa to intersphinx inventoryAric Gardner1-0/+1
Issue-ID: CIMAN-33 Signed-off-by: Aric Gardner <agardner@linuxfoundation.org> Change-Id: I455858f33fc843b20fd86a9092ae206dd446e4bb
2020-04-06Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/osa.git from branch 'master' to 2ffd40cf69006a1346dd63f2f7ae11837ffd27cc - fix osa docs with new docs example of how this changeset was created. includes link to documentation: https://gist.github.com/Aricg/bf95ef40c542ba211be8771e88e6f410 merging this will create https://onap-osa.readthedocs.io This build will run in parralelle to the current docs generation method untill we are ready to cut over. Issue-ID: CIMAN-33 Signed-off-by: Aric Gardner <agardner@linuxfoundation.org> Change-Id: I4a477027bcc858c799228f77c9a37b55c0659fd9
2020-04-06Update git submodulesPatrick Brady1-0/+0
* Update docs/submodules/appc/deployment.git from branch 'master' to c32f2425b8f6e78229f9fd8a58fedd3c3107403a - Increment version to 1.7.2-SNAPSHOT Change-Id: I999e05b6e7418faccb22f433c5ca0796c8afb20f Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1816
2020-04-06Merge "Intersphinx linking"Jessica Wagantall3-1/+155
2020-04-06Update git submodulesPatrick Brady1-0/+0
* Update docs/submodules/appc/deployment.git from branch 'master' to fd44b067a67363cb4c8d8750a2cb6481332d9b4a - Possible fix for jenkins build This fix gets the platform logic installer and copies it directly from the target directory where it was built. Change-Id: Id9531908cfe25aa307912eca8e4d92a3397b53d8 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1860
2020-04-06Update git submodulesSunder Tattavarada1-0/+0
* Update docs/submodules/portal.git from branch 'master' to 5e84a934dd7895af58af39d8352263ec8f19feeb - Merge "Assign default user sort type issue is fixed" - Assign default user sort type issue is fixed User default sort type Issue-ID: PORTAL-862 Change-Id: Iaa82801e21aff4be7639ad014784561b5aa59e20 Signed-off-by: jz385p <jegadeesh.babu@att.com>
2020-04-06Update git submodulesUNNAVA1-0/+0
* Update docs/submodules/dmaap/messagerouter/messageservice.git from branch 'master' to c0c66aedd3d3ff141e1a9c13afb5e7621cb21731 - reduce the offsets topic partitions Issue-ID: DMAAP-1418 Change-Id: I168b4eadaa36fcfb7639035aaf2915416809848d Signed-off-by: UNNAVA <su622b@att.com>
2020-04-06Update git submodulesLorraine Welch1-0/+0
* Update docs/submodules/portal.git from branch 'master' to 983c2d568a873060c046598daeebe481d043fb7a - Merge "Fixed Userbar broken user image" - Fixed Userbar broken user image Fixed Userbar broken user image Issue-ID: PORTAL-872 Change-Id: I62863118e5880c2789acce6416d0ea618fc0857a Signed-off-by: Sudarshan Kumar <sudarshan.kumar@att.com>
2020-04-06Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to bda5f8f4e97abe10288434c4642c52eff1d00fd3 - Fix env variable names ODL_ADMIN_USERNAME and ODL_ADMIN_PASSWORD Correct typos of variable names for ODL admin user and password to match variable names in installCerts.py Change-Id: I1984a27de5c7a071e7f7c7a3f58722ee8687b039 Issue-ID: SDNC-1131 Signed-off-by: Dan Timoney <dtimoney@att.com>
2020-04-06Update git submodulesvasraz1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to e052e9b0cc7d30f2fb4bada0a3e75e2c4d0e2f73 - Increase test coverage Change-Id: I5ed0e2520305519af573df10768c3ee69c39f213 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2833
2020-04-06Update git submodulesaribeiro1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 8c5c8c57766412f57a8c7168b268b59e8ae72667 - Fix when adding a VF Remove duplicated field when adding VF, fix label names and fix field that appears mandatory even though its not Issue-ID: SDC-2865 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Iac0866ebcd1b90570949fe9c851fec1f861818af
2020-04-06Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/apps.git from branch 'master' to c1a4da3e1e528cf8becd0c090939b54689e7295d - Log to stdout / stderr Update start script for naming microservice to use tee to write to both stdout/stderr and to a log file. Change-Id: I762273475e116af1e35316e6b704554fd0a52a66 Issue-ID: CCSDK-2256 Signed-off-by: Dan Timoney <dtimoney@att.com>
2020-04-06Update git submodulesBharath Balasubramanian1-0/+0
* Update docs/submodules/music.git from branch 'master' to 6700313cfacc184768e7ac4fc8b2e2f1ce482565 - Merge "unnecessary imports removed" - unnecessary imports removed unnecessary imports removed Issue-ID: PORTAL-869 Change-Id: I94d84c5ce155a381237e649e5ad9280bfdddd6b1 Signed-off-by: Indrijeet Kumar <indriku1@in.ibm.com>
2020-04-06Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 75bf985a00799617a6ae8c278596e3d4f591f17e - Merge "updated bbinput setup to pull vf if no vnf found" - updated bbinput setup to pull vf if no vnf found updated bbinput setup to pull vf if no vnf found updated name of unit test as its a compilation error updated pom to get logging analytics library fix broken test by removing vnf from service fixed test as mock for setup utils was not correct Issue-ID: SO-2783 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I1077ef934b19980d3fecd839e5f383555aa72d1d
2020-04-06Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 3b0019a08a5eb405c7df00958b1b90e2d91b98d1 - Merge "Added logic to update the requests DB when a" - Added logic to update the requests DB when a Added logic to update the requests DB when a Create or Delete BB is silent success and updated enum Updated regrex and add junit test for orch validator and formatted files Formatted pom files that were not formatted correctly. Removed use of ternary operator if statement and moved enum to static final. Updated equals method to include resource status message for mockito verify Removed resourceStatusMessage from equals and used argument capture instead Issue-ID: SO-2782 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I3a292f57d2771200ce85a99e845e776e2f3bd600
2020-04-06Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to 11b3ac5fc12e98123cc3ae44a2becbc7e0d493ce - Merge "mso to add additional validation for alacarte" - mso to add additional validation for alacarte Initial check in for querying AAI via DSL remove code which is not needed from validator Issue-ID: SO-2781 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I2828d9c107e747bac4dad02c46c2b505ca96a214
2020-04-06Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to e043e68a8cf1bd4bcf4e4717a5bfe7a7edb2a9a0 - Merge "Use env var to determine debug logging appender" - Use env var to determine debug logging appender use env var to determine debug logging appender Issue-ID: SO-2791 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I8aee6b28a789bc91137d10914673f7b51a74617a
2020-04-06Update git submodulesSteve Smokowski1-0/+0
* Update docs/submodules/so.git from branch 'master' to ffc15eea7527db5d99c76d46456771aeb3853115 - Merge "updates to groovy tests" - updates to groovy tests small updates to groovy tests Issue-ID: SO-2789 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: Id7f809166b73c4643f06bde44b79ac407d4e148d
2020-04-06Update git submodulesSmokowski, Steven1-0/+0
* Update docs/submodules/so.git from branch 'master' to 2ba1b39b20d4544c035bb3c3c2833993e39714cb - Update version of so libs use newer version of so libs Issue-ID: SO-2790 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I5a319d8e49f9d004dcc53692c80dd88e203318a1
2020-04-06Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to 964dcf86d84ad9d06b1034dab627ab1b6de014b3 - Add env needed by installCerts.py to docker-compose.yml Add env variables needed by installCerts.py script to the docker-compose.yml. Change-Id: I3a61f67c2fbaf7e59aa4b35ec8d80040c2c5b85f Issue-ID: SDNC-1131 Signed-off-by: Dan Timoney <dtimoney@att.com>
2020-04-06Update git submodulesEinat Vinouze1-0/+0
* Update docs/submodules/vid.git from branch 'master' to f6204c8b0f9b4f778419c16400b8a431f5797beb - Add another VNF to the new view/edit screen - Integration test Issue-ID: VID-803 Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com> Change-Id: I9e2a58863855353b75edab44129c96b319511dde Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
2020-04-06Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to f4518e3217abcba854054623a0d838a7250b3c73 - Merge "Corrected AAI endpoint & auth with SO APIH override.yaml" - Corrected AAI endpoint & auth with SO APIH override.yaml SO APIH was missing aai endpoint & auth credentials. It has been corrected Issue-ID: SO-2788 Signed-off-by: Ramesh Parthasarathy(rp6768)<ramesh.parthasarathy@att.com> Change-Id: I40ee3b495205cacca740da8668d7c9a38febc1a1
2020-04-06Update git submodulesedyta1-0/+0
* Update docs/submodules/aaf/certservice.git from branch 'master' to d04314864e90fb138a050b44b86f15c655322714 - Fix sonar issue RandomPasswordGenerator Issue-ID: AAF-1118 Signed-off-by: Edyta Krukowska <edyta.krukowska@nokia.com> Change-Id: Idfd7e957b6dda043d7343ddffe334c5400620217
2020-04-06Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to bafce31069b949a6901f8253505e36e4db4ea3af - Merge "[NBI] Use AAF init container for certificates" - [NBI] Use AAF init container for certificates Onboard server certificates for HTTPs via AAF init containers. Issue-ID: EXTAPI-375 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: Icbcf075dd2dd8588aa9f14d23974a122bde38ae7
2020-04-06Update git submodulesJim Hahn1-0/+0
* Update docs/submodules/policy/parent.git from branch 'master' to c80213e91c20dca8794a7d7540d9afb876b6d693 - Add RE2J in lieu of java.util Pattern Sonar complains about java.util Pattern usage when the pattern has quanitifiers like "*" or "+". It suggests using RE2J instead. Added that to the parent pom - hope it doesn't have licensing issues. Issue-ID: POLICY-2305 Change-Id: I4a79d073e911f42911dabfab92177bce5893efd7 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-04-06Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 3f2818ea024b8e4089c4db3193a24986bf8e999a - Merge "Update PH config" - Update PH config Change-Id: I517e1ed97538bfc83a34a0f65bee46f7eb3b297b Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com> Issue-ID: DCAEGEN2-2191
2020-04-06Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/sdc/sdc-distribution-client.git from branch 'master' to 2c41d11de03c07739ae395683c9d834ab282821c - Allow SDC client to connect to SDC in HTTP I've added a toggle which allow to connect to SDC using HTTP and not only HTTPS. By default, we're still on HTTPS. Issue-ID: SDC-2721 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I48046c19aed7d81f9e03a30b3b081b9d8dd1495e
2020-04-06Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to b229137d476e4ee74ee0078ad7b89b2ea1fb6813 - Merge "1.7.1 release for APPC" - 1.7.1 release for APPC 1.7.1 release for APPC Issue-ID: APPC-1849 Change-Id: I6b5f2d03bd737b0b12345339ab923f1c9b7627b4 Signed-off-by: Taka Cho <takamune.cho@att.com>
2020-04-06Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 36ed0482eca91d1fa3efa4a5c7a7445516c6bd58 - Fix ready probe exit code The exit code ranges from 0 to 255, so it should not be returning the http status code. This was breaking the health check for the docker_run.sh script, which was always getting a 0 return code in a case of 503 http status for example. Change-Id: I52b2923cdfc0d7389894917ccc4aa58468ac8bdc Issue-ID: SDC-2867 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-06Update git submodulesKanagaraj Manickam1-0/+0
* Update docs/submodules/cli.git from branch 'master' to 03e24d7a2fb5276b45db157da8a95b6044807c79 - Set Jline to 2.14.3 Issue-ID: CLI-255 Change-Id: I165717c683ad2aa5ba49a197b5a5c0c429d1111a Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
2020-04-06Update git submodulesKanagaraj Manickam1-0/+0
* Update docs/submodules/cli.git from branch 'master' to b81e8dc95d84ac5a8126d7cc90f0175611d7a425 - Merge "Set HTTPS port to 443 & 9090" - Set HTTPS port to 443 & 9090 Issue-ID: CLI-255 Change-Id: I9ea233598f0502907fec3d2fea4b600c5f87b35e Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
2020-04-05Update git submodulesilanap1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 94e7778319778713c0b4e2ccf590cefc6e18c21e - bugfix for operations screen Add Operation Button is missing in Service management committing fix by Akiva Issue-ID: SDC-2843 Signed-off-by: ilanap <ilanap@amdocs.com> Change-Id: I9a6c89e45ea425eb9abf827906562e14a39cf1ff
2020-04-05Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to e6a4b30df9c1e712feacdacb04b205c9efd773bc - Fix sdc-backend image context.xml creation The file was not being overwritten during the build process. It was not changing after the first build, causing war artifact version problems while running the container. Change-Id: I8b1ab741c82f9274a2049bb4c2d1c3a8c1c8ee38 Issue-ID: SDC-2862 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-05Update git submodulesaribeiro1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 9cd184ef2b013197cd984cf881335c08a9eab01f - Fix data type properties declaration According to TOSCA Network properties definition the keyname 'ip_version:' should have Integer as valid_values rather than String Where the keyname 'count:' is declared as a String type the default value should be String rather than Integer Fix misspelled ONAP types 'onap.datatypes.monitoring.measurementType' and 'onap.datatypes.monitoring.managedObjectDNsBasic' Fix the keynames 'upstream:' and 'downstream:' as both are declared as a String type the valid_values should be String rather than Integer Issue-ID: SDC-2864 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I56afdf2818b5f2463fb6088cd8b468fd38ef5086
2020-04-05Update git submodulesaribeiro1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to dd463c2843dcfbc5b375d90630788f5f269c7b0a - Fix keyname 'constraints:' according to TOSCA property definition Issue-ID: SDC-2863 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I955af393b4f10ca56a01bfcb2f62c37496c484d6
2020-04-05Update git submodulesaribeiro1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 1570565c12f70cb7dd5bcc29822b607ce103e4fc - Remove keyname 'required' from Schema definition The Schema definitions does not have keyname 'required'. The keyname 'required' is a TOSCA property definition. Issue-ID: SDC-2866 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I0a827d30c8790ec63c20a9da6cd0758eb024c491