summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2020-06-05Update git submodulesSandeep Shah1-0/+0
* Update docs/submodules/ccsdk/distribution.git from branch 'master' to eef9c4714984a1a162fafd0a004cd83e02f20400 - Align requestID, subrequestID for DMAAP msgs Align the common header for DMAAP message received and published, as Policy depends upon them to corelate policy driven events. Updated DG's Issue-ID: CCSDK-2395 Signed-off-by: SandeepLinux <Sandeep.Shah@ibm.com> Change-Id: I7c65d00c05ed395c6c6f89f36763ae0aefde87fb
2020-06-05Update git submodulesManjunath Ranganathaiah1-0/+0
* Update docs/submodules/aaf/sms.git from branch 'master' to 516213f563b079c982fa706aa9d97c27581e8655 - Remove expired certs and key, use them from oom. Issue-ID: AAF-1159 Signed-off-by: Manjunath Ranganathaiah <manjunath.ranganathaiah@intel.com> Change-Id: I658af495ce2e30e34f94bcb57bc06c335a7b724b
2020-06-05Update git submodulesKAPIL SINGAL1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to aec7bcff2843cfe60f946535599b49b1778dce45 - Merge "Actions list - UI" - Actions list - UI Issue-ID: CCSDK-2411 Signed-off-by: Sarah Abouzainah <sabouzainah.ext@orange.com> Change-Id: I4eccc5261e4c4ae9c9a60f0c4c518129973b066d
2020-06-05Update git submodulesSamuli Silvius1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to bef1899ac0e9cc77e8c22feffaab95cbc923d6ba - Data dictionary fixes and improvements from vFW CNF demo During doing vFW CNF use case CBA model with CDS (See INT-1260) found some diff/improvements to update to CDS starter dictionary. Issue-ID: CCSDK-2408 Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com> Change-Id: I8e899b3ab34bcd499e917da318f589e69008dc6d
2020-06-05Update git submodulesBartek Grzybowski1-0/+0
* Update docs/submodules/integration.git from branch 'master' to a3737ae0e71cc2658fd4a673cfa91001b03b3680 - Support stopping sending PNF registration messages in Python module Change-Id: Iae7d300e6e09d152b6e7daaebd9c85ba763fc077 Issue-ID: INT-1613 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com> - Add test case for invalid '--count' option value Change-Id: Ib46c26889f01ce0cd9d90865070d5c5ac9b5d08a Issue-ID: INT-1613 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com> - Drop shell wrapper for 'trigger_custom' action as well Change-Id: I388038656505c6937e10ba9f65d70d0e6514e17b Issue-ID: INT-1611 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com> - Support triggering simulator app directly from MassPnfSim module Change-Id: Ice52848bedf8722aa142de74342190378ea593cd Issue-ID: INT-1611 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com> - Drop shell wrapper for stopping simulator instances Instance method is added to manage stopping simulator instances and ROP scripts directly in MassPnfSim class. Change-Id: Ic551f99c0f5f2a177b9c72daac02690b0bbded04 Issue-ID: INT-1610 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
2020-06-05Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to f36451a9d5bcc88adb3a7f0062976cbc8ec668b1 - Merge "Changed sli-provider dependency" - Changed sli-provider dependency Due to refactoring in sli/core, the dependency sli-provider-base should now be used in place of sli-provider. Issue-ID: CCSDK-2412 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I35e356dd80cc355aedf74a9adb49665a1292d77c
2020-06-05Update git submodulesSamuli Silvius1-0/+0
* Update docs/submodules/integration.git from branch 'master' to 7c41c16ed62fef316f6e93faeb18bec350c5fbf5 - [vFW_CNF_CDS] UAT testing doc update Verified UAT testing as much as it worked for vFW_CNF_CDS. Spy recording was successfull technically as yaml response was received but looks like missing some external calls. UAT Verify POST call did not worked as expected results was not according to spy output. Or some other problems. Document updated accordingly. Issue-ID: INT-1531 Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com> Change-Id: Ic2b13048fbff47fb8d6e82f3921a9922030bc971
2020-06-05Update git submodulesmrichomme1-0/+0
* Update docs/submodules/integration.git from branch 'master' to 950afcec26f87ee83041de405a79ca66a1f7d46d - Update doc to reference 1.6.3 RC2 frankfurt image - refactoring of the integration page - add link to s3p page - add a table of the repositories managed by Integration Issue-ID: INT-1551 Signed-off-by: mrichomme <morgan.richomme@orange.com> Change-Id: I36adec41f6938925561210da905d69c76cddfa8b Signed-off-by: mrichomme <morgan.richomme@orange.com>
2020-06-04Update git submodulesEric Multanen1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to 8e7a20777f2100324526a34b4b6c943b512df0fb - Move cluster management into its own microservice Split out the cluster provider and cluster APIs and packages into a separate microservice to align with the architecture. Issue-ID: MULTICLOUD-1029 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com> Change-Id: I08f357b5a488004a2389b72a178ae33e101d1540
2020-06-04Update git submodulesVENKATESH KUMAR1-0/+0
* Update docs/submodules/dcaegen2.git from branch 'master' to 7cac724fc70cc723c526d39eef1e8aaf4faf941b - fix broken links Change-Id: I47ad3e2f9d425a2165cb0112d58876d479cadb43 Signed-off-by: VENKATESH KUMAR <vv770d@att.com> Issue-ID: DCAEGEN2-2291
2020-06-04Update git submodulesLorraine Welch1-0/+0
* Update docs/submodules/portal.git from branch 'master' to 8be1cc0ab124a5d01b7787b10e527033924d631b - Updated Frankfurt Release Notes for Images Issue-ID: PORTAL-885 Signed-off-by: Lorraine Welch <lb2391@att.com> Change-Id: I9a72f12de91a113ed2e743a3922aed1c5b547518
2020-06-04Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 8c7774e524e4df5105f8b3a199d368adf4937886 - Merge "correct release note" - correct release note correct "Upgrade notes" section of Frankfurt Issue-ID: CLAMP-840 Change-Id: I804846934eddcbe0577a04f6021cc62e6107e27c Signed-off-by: osgn422w <gervais-martial.ngueko@intl.att.com>
2020-06-04Update git submodulesxuegao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 715746fbd2bcb18193138d56df50b0d44da2681b - Remove logout Remove the logout option from UI. Issue-ID: CLAMP-860 Change-Id: I711b8a7eaf523195f0534044efd3dd74c3f1e0be Signed-off-by: xuegao <xg353y@intl.att.com>
2020-06-04Update git submodulesRupinder1-0/+0
* Update docs/submodules/appc.git from branch 'master' to 3baea8e7e5ac5039d27ecd2d504f4ea24034f730 - lower code smells Issue-ID: APPC-1859 Change-Id: I6d0a7563199355a446345f568415a78856c0cfa6 Signed-off-by: Rupinder <rupinsi1@in.ibm.com>
2020-06-04Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to 523bb0f096646ff70b8f9e94ac63828fe2fc3052 - Add deprecations to release notes Updated release notes to indicate deprecation of SDNC portal and VNF-API Change-Id: I7ba72bbfb225256b8ee060d52857e680a016920a Issue-ID: SDNC-1231 Issue-ID: SDNC-1232 Signed-off-by: Dan Timoney <dtimoney@att.com>
2020-06-04Update git submodulesBoslet, Cory1-0/+0
* Update docs/submodules/so.git from branch 'master' to f239be089f523a016cf52f723638c060f899978f - Fixed logging and have flow error on audit Fixed logging and have flow error on audit failure. Issue-ID: SO-2973 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I712fece759deb651368b1eb4c524ddb0b0e46686
2020-06-04Merge "Remove link to Postman collections"Andreas Geissler2-11/+1
2020-06-04Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 83ba0bb4bfe3978f0b0ba7c251ed28fc6686c20b - Merge "[AAF] Add CMPv2 Cert Service" - [AAF] Add CMPv2 Cert Service This new micro service allow retrieval of certificates using CMPv2 protocol and relay the requests to CA server (such as EJBCA provided in contrib folder). Issue-ID: AAF-1083 Change-Id: Ib3acba3d071533ad933d043f067147e8406d8fa8 Signed-off-by: EmmettCox <emmett.cox@est.tech> Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
2020-06-04Update git submodulesPaweł Baniewski1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to 9602ca33aef3a2a441513359b2750e9fbee11cb4 - Merge "Update release-notes" - Update release-notes This reverts commit 067bede1a6c7fbd5dccc7302783641c4c96b33fa. Issue-ID: AAF-1148 Change-Id: I0e2b167207291f0c54d03a0e888a6f426a3f6232 Signed-off-by: Edyta Krukowska <edyta.krukowska@nokia.com>
2020-06-04Remove link to Postman collectionsEric Debeau2-11/+1
The postman suite has not been updated for Frankfurt There is no more repo in Integration project Remove the link towards the Integration project containing the Postman collections Issue-ID: DOC-630 Signed-off-by: Eric Debeau <eric.debeau@orange.com> Change-Id: I770184034b988772d0755dda8b1362c7134361be
2020-06-04Merge "Correction of NodePort list and removed SW versions for ONAP ↵Eric Debeau2-117/+82
installation Corrections after comments..."
2020-06-04Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 76aba9965ffb62bc59f9c95ba61811448010f2cf - Fix js lib Fix js lib dur eto modal removals and re-enable the lib publish Issue-ID: CLAMP-854 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I131d026f03b522954e2231141b1120cf7a66ba2a
2020-06-04Correction of NodePort list and removed SW versions for ONAP installationandreasgeissler2-117/+82
Corrections after comments... Issue-ID: DOC-627 Signed-off-by: andreasgeissler <andreas-geissler@telekom.de> Change-Id: I452c6862e48f0ee30644d320a70f0644b9e23469
2020-06-04Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 116c26e1c243f26258558148e9f69e42b3787367 - Rewrite of `certifyToscaElement` to remove NPE - Modularized `certifyToscaElement` in smaller, less complex methods (`handleRelationsBeforeCertifyingAndProcessClone`, `cloneToscaElementAndHandleRelations`, `handleRelationsOfNewestCertifiedToscaElementAndReturn` & `logDebugMessageAndReturnStorageOperationStatus`) - Removed potential NPE flagged by Sonar in `certifyToscaElement` Issue-ID: SDC-2966 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: Id65871cbfd611abdcc878e61c1541f01ff972828
2020-06-04Update git submodulesIttay Stern1-0/+0
* Update docs/submodules/vid.git from branch 'master' to 60e246814415ee1daf838db78aff8afd53ce46f5 - test COMPLETED_AND_PAUSED should have correct menu items Issue-ID: VID-821 Change-Id: I8d5301a9534345d83b06f33a9d2daca45a613922 Signed-off-by: Ittay Stern <ittay.stern@att.com>
2020-06-04Update git submodulesmrichomme1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 1884ba91333caea194da7aaac0af2afcc9b43a83 - Update git submodules * Update kubernetes/robot from branch 'master' to 7ee95b4c8f667dd0506499db17688473309cd91e - bump testsuite 1.6.3 for frankfurt RC2 the delta with 1.6.2 includes minor fixes for - 5gbulkpm - pnf-registrate Please note that these changes are already taken into account in CI as xtesting dockers are rebuilt everyday but it is cleaner to execute the use cases Issue-ID: INT-1553 Signed-off-by: mrichomme <morgan.richomme@orange.com> Change-Id: Ibd41c65d4190421e7c790f7e1f8a754923803757 Signed-off-by: mrichomme <morgan.richomme@orange.com>
2020-06-04Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 1e130589fcc4dd8fba2ff8f2f94d9bd0ecbe206d - Merge "bump th so version to 1.6.3" - bump th so version to 1.6.3 Issue-ID: SO-2955 Signed-off-by: seshukm <seshu.kumar.m@huawei.com> Change-Id: If47a43c642e59fe4048d1d816f971e25524236da
2020-06-04Update git submodulescyuamber1-0/+0
* Update docs/submodules/usecase-ui.git from branch 'master' to 55f718412779b3d9c9a73f210a81504d99e4d6b2 - docs: change the installation docs Change-Id: I830bbd9b4f2e1323d5392e0664e3536782bb2ad9 Issue-ID: USECASEUI-435 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
2020-06-03Update git submodulesRitu Sood1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to 0c22bafd470e36647157b6d01221cb17841f360a - Merge "Add UninstallApp call to grpc" - Add UninstallApp call to grpc Issue-ID: MULTICLOUD-1005 Signed-off-by: Manjunath Ranganathaiah <manjunath.ranganathaiah@intel.com> Change-Id: I90c8ff0d548690ea19d325612d1bcd3e5049dc36
2020-06-03Update git submodulesEric Multanen1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to a6e2a3a65a6e4f3f1d964578ae4e60c6f9dd1184 - Reorganize ncm packages to align with architecture Reorginize the ncm packges to delineate - cluster provider and cluster management - virtual and provider netowrk intent management - intent scheduler - internal ovn4k8s network controller Overall, no code changes, just moving things around. Issue-ID: MULTICLOUD-1029 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com> Change-Id: I3d43c7e4eb6f285b51c0385ba18626d3511a14f5
2020-06-03Update git submodulesEric Multanen1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to ad7782cbf83c11f152a6457f3808a4da99a1ae56 - Create OVN network action controller from ncm Split out part of ncm microservice to act as the Onv4k8s network action controller for the orchestrator. No code changes really - just moving around to fit the architectural plan. Issue-ID: MULTICLOUD-1029 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com> Change-Id: I17292ac72d041050269f05fc4a0c2a6ca741aeb5
2020-06-03Update git submodulesdglFromAtt1-0/+0
* Update docs/submodules/dmaap/buscontroller.git from branch 'master' to a97d519633b278bb534407a60725b95e72e77150 - Fix Release Notes format Signed-off-by: dglFromAtt <dgl@research.att.com> Change-Id: I3b1cf41a9a0204b919c65fb3543463e2f90310e8 Issue-ID: DMAAP-1442
2020-06-03Update docs to frankfurtJessica Wagantall1-1/+1
Update branch to frankfurt in preparation for the release Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: I01d71a8ccd501fbf0ff9aecf8e74847cbb68488b
2020-06-03Update git submodulesJames Forsyth1-0/+0
* Update docs/submodules/aai/sparky-be.git from branch 'master' to 7a7a97cb395a2df6cad958aff444de8c107ff60f - Merge "Containers should not run as root by default" - Containers should not run as root by default Issue-ID: AAI-2822 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I2927b16d08bf7fc0f6e85dcbfe5fbc119f864a23
2020-06-03Update git submodulesIttay Stern1-0/+0
* Update docs/submodules/vid.git from branch 'master' to 1a247cc4b87b7bf32489f9524062b4df361fae79 - remove import and add force in order to fix cypress Issue-ID: VID-821 Change-Id: I70d6d0acb90d06f4ba9d356098ad2052c5195464 Signed-off-by: Ittay Stern <ittay.stern@att.com>
2020-06-03Update git submodulesRam Krishna Verma1-0/+0
* Update docs/submodules/policy/parent.git from branch 'master' to 9fcbadcca35f605cb7b9255034251c24ec31815c - Merge "Stability test documentation for Apex-pdp" - Stability test documentation for Apex-pdp Issue-ID: POLICY-2457 Signed-off-by: aditya.puthuparambil <aditya.puthuparambil@est.tech> Change-Id: Ic1c7a2a5e716ab89eb50a211e2e9ca0f941edfd2
2020-06-03Update git submodulesJozsef Csongvai1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 12ab1a900ad255ffec2f18530e85d9b196417e26 - Set explicit uid and gid in dockerfiles This fixes permission issues with shared nfs volumes caused by mismatch in dynamically assigned gid and uid between containers. Issue-ID: CCSDK-2398 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: Ie47873c98211b280490ee7a6bcc60ceef49dd690
2020-06-03Update git submodulesSylvain Desbureaux1-0/+0
* Update docs/submodules/oom.git from branch 'master' to 5db2804f1a17c415847fea73b3567c1b90c8927a - Merge "Using AAF release 2.1.23 dockers" - Using AAF release 2.1.23 dockers Uplifting AAF to 2.1.23 Issue-ID: AAF-1127 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: Ib7f76feb6d3adc622d4f198a1f954062d84a3ca2
2020-06-03Update git submoduleslf-jobbuilder1-0/+0
* Update docs/submodules/vnfrqts/requirements.git from branch 'master' to c4367581f11f062ee5bc96764d0140e08abc61e7 - Update css file name in conf.py ribbon.css is the correct name of the css file. Issue-ID: CIMAN-376 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: I68f67046bc1e965fb6553d6dcb61ed7d51ccbb16
2020-06-03Update git submoduleslf-jobbuilder1-0/+0
* Update docs/submodules/vnfrqts/usecases.git from branch 'master' to 44810c50c866d935b82f67d5537723247c255a33 - Update css file name in conf.py ribbon.css is the correct name of the css file. Issue-ID: CIMAN-376 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: Ic15775cc27844fffb9e65a334241b1a20de3cebf
2020-06-03Update git submoduleslf-jobbuilder1-0/+0
* Update docs/submodules/vnfrqts/guidelines.git from branch 'master' to 19b4e18248f81c7f468f74ae8de612f10f771f38 - Update css file name in conf.py ribbon.css is the correct name of the css file. Issue-ID: CIMAN-376 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: I18705964e1cd24810c61efc43fcd62d871d46603
2020-06-03Update git submoduleslf-jobbuilder1-0/+0
* Update docs/submodules/vnfrqts/testcases.git from branch 'master' to 348eea96371be1d916c55ce8ad0faa153c433156 - Update css file name in conf.py ribbon.css is the correct name of the css file. Issue-ID: CIMAN-376 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: I4b185ffc22e627fd6a5aca42b945229b7b40dd20
2020-06-03Update git submoduleslf-jobbuilder1-0/+0
* Update docs/submodules/aai/aai-common.git from branch 'master' to a81695efd81cc14d53ad94c5539101c641feb539 - Update css file name in conf.py ribbon.css is the correct name of the css file. Issue-ID: CIMAN-376 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: I202b0f4bd624e611e2b5019337d4d247e1b6dc29
2020-06-03Update git submodulesJames Forsyth1-0/+0
* Update docs/submodules/aai/esr-server.git from branch 'master' to b8ec3c0b5162db7e2ec60d8b2381d3bb115cedf0 - Merge "Modify JAVA Env Setting" - Modify JAVA Env Setting Issue-ID: AAI-2907 Change-Id: I01c55fb560b971f308f9699841ec1423a90fb18e Signed-off-by: HePeng <he.peng6@zte.com.cn>
2020-06-03Update git submodulesRupinder1-0/+0
* Update docs/submodules/appc.git from branch 'master' to aa350b8ce81033db26dbb88f47c072bd0f32ce86 - Renamed local variable to match the regular expression Issue-ID: APPC-1859 Change-Id: Ie465c14b37705e98ec289f43c574780a31fe4121 Signed-off-by: Rupinder <rupinsi1@in.ibm.com>
2020-06-03Update git submodulesRupinder1-0/+0
* Update docs/submodules/appc.git from branch 'master' to ee2eb7f226eb6e4faf6aa020acf379cbd2e2b254 - Renamed local variable to match the regular expression Issue-ID: APPC-1859 Change-Id: Iaddff797c8e86ea38a826592fa67c2f5ddac04a9 Signed-off-by: Rupinder <rupinsi1@in.ibm.com>
2020-06-03Update git submoduleslf-jobbuilder1-0/+0
* Update docs/submodules/appc.git from branch 'master' to a035cc483c3dd0d01a9ce033ad0c748749f5f385 - Update css file name in conf.py ribbon.css is the correct name of the css file. Issue-ID: CIMAN-376 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: I26f4c09aaf4a587b663453b7cbc6fba6161ffa22
2020-06-03Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to b31ee1c9c566ae070c214e9a26beefb9fc939ff9 - Merge "Add check to maven pom.xml for verifying integrity of ui-react-lib" - Add check to maven pom.xml for verifying integrity of ui-react-lib A new shell script is introduced for verifying that ui-react-lib/libIndex.js is faithfully synchronized with components maintained in ui-react/src, in order to provide an NPM onap-clamp-ui-lib Issue-ID: CLAMP-669 Change-Id: I48eb979e3fbe110b718b96c0fcee08a2ced7a36b Signed-off-by: Ted Humphrey <Thomas.Humphrey@att.com>
2020-06-03Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 571d4aa9ffa02acca1a1edbff2f6cf5d7748950f - Merge "Update sql files" - Update sql files Update sql files and swagger due to svg removal Issue-ID: CLAMP-854 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I90b9ea58c63733d6b7a8ed7354469a68e9f914cf
2020-06-03Update git submodulesByung-Woo Jun1-0/+0
* Update docs/submodules/so.git from branch 'master' to 55271a1679d0b070a090692af1c970872407b66f - Merge "update the release docs" - update the release docs Issue-ID: SO-2821 Signed-off-by: seshukm <seshu.kumar.m@huawei.com> Change-Id: Ib2f85baf37c58f00f2dccc87e65ca119c64c0928