summaryrefslogtreecommitdiffstats
path: root/docs/submodules/clamp.git
AgeCommit message (Collapse)AuthorFilesLines
2020-06-30Remove docs submoduleslf-jobbuilder1-0/+0
This is the final change in the docs migration topic CIMAN-376. We have switched projects to use intersphinx linking and away from submodules. Issue-ID: CIMAN-376 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: I50d3959f213fb5d0a3bfff46c83db4f42b81374b
2020-05-04Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 0c29796f7489015913a5793f13b2586099493464 - Bump version to Guilin Bump 5.1.0 for Guilin on master branch Issue-ID: CLAMP-845 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ie04d75e2bb88dd2e20c53a9615b780df0e65b485
2020-04-29Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 04e82bebc39bb0bdadb8e79c427c9d8aa1a58ac5 - Release 5.0.6 Release 5.0.6 Issue-ID: CLAMP-833 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I23a21c4178cf18c1f0805dbe59bcf360822fcd71
2020-04-29Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 38683518ef58d4d6b3d98a76c6695809e38c10e2 - Release 5.0.6 Release 5.0.6 Issue-ID: CLAMP-833 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Iad9437aaa917ba5df7ad50b56ac0fd5b11f71da7
2020-04-29Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 975dccc51b43b5a4019c45f448e63a110e3bd603 - Fix VNF entityId in policies Fix the VNF entity IDs value in json schema for each policies (in UI) Issue-ID: CLAMP-843 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I9515b01422acdfc0ec36f10cc70994145e561d7f
2020-04-27Update git submodulesGervais-Martial Ngueko1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 5523a23a5d8a66f690fc2dec7975cb8bfb8db975 - Merge "Fix bugs reported by sonar/nexus-iq" - Fix bugs reported by sonar/nexus-iq Rollback fixes for Nexus-iq, it does not help Issue-ID: CLAMP-841 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I280c4cf612298d1cda64b8ed39a0a416f936fdc4
2020-04-27Update git submodulesGervais-Martial Ngueko1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 965914be0781fb320ce84126ed03f8e5cc1f7dde - Merge "Fix bugs reported by sonar/nexus-iq" - Fix bugs reported by sonar/nexus-iq Fix bugs reported by sonar as critical, major, ... Issue-ID: CLAMP-841 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I23122c064b64ebe2a2c8c33540c4be0b0895157d
2020-04-27Update git submodulesGervais-Martial Ngueko1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 80a6f12466e31e76ffd0edf46934cae22b2bf171 - Merge "Fix bugs reported by sonar/nexus-iq" - Fix bugs reported by sonar/nexus-iq Fix bugs reported by sonar as critical, major, ... Issue-ID: CLAMP-841 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I3ec04016541e4a644c02e5c4601c0ee608eb0ca3
2020-04-27Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 01443d4c9bb69f75070b4b42ee531cb445ed77a4 - Fix bugs reported by sonar Fix bugs reported by sonar as critical, major, ... Issue-ID: CLAMP-841 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I7c33f83bc79be0b3b14b4f58f50a59471f3ab11d
2020-04-27Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 400f7fc1b63616e0146605b67883e6ceff0ae619 - Prepare 5.0.6 Prepare 5.0.6 Clamp release Issue-ID: CLAMP-833 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I459df08e623318e1b07912cccec5143d4f67008c
2020-04-27Update git submodulesXue Gao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 615eb9bc91c2e685c4eebb96b44b157fd71fa8f0 - Merge changes Id525d532,I91723b83 * changes: Fix bugs reported by sonar Fix bugs reported by sonar - Fix bugs reported by sonar Fix bugs reported by sonar as critical, major, ... Issue-ID: CLAMP-841 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Id525d532d4f405216da44f95503e06e172458e70 - Fix bugs reported by sonar Fix bugs reported by sonar as critical, major, ... Issue-ID: CLAMP-841 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I91723b83289e25d6e27b0c925107e50314f441fc
2020-04-23Update git submodulesChristophe Closset1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 740a4cb495e6069d3d5cb3b93ca35594f64a3419 - Merge "Release 5.0.5" - Release 5.0.5 Make a release of the stable code in 5.0.5 Issue-ID: CLAMP-833 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ideb631c61c389a45f91f21edcf2f4612189b4b5a
2020-04-23Update git submodulesChristophe Closset1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 7ecef7df7c4f73a61619690b83209d79b00516f9 - Merge "Release 5.0.5" - Release 5.0.5 Make a release of the stable code in 5.0.5 Issue-ID: CLAMP-833 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I9c3c25510196e1ceed5a245a7e71f067a7a20604
2020-04-23Update git submodulesChristophe Closset1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 6c42be8a5b9a90c3a2c2907174d4264cf5606ac4 - Merge "Fix entityId bug" - Fix entityId bug A user defined entry has been added to the entity id by default, so that json editor falls back to that value when re-editing the policies Issue-ID: CLAMP-829 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I593163f87df9f97a19964428bf2016154dc9576d
2020-04-23Update git submodulesChristophe Closset1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to e57ccc972e080ce039d7a1325332fcae3b75bbf1 - Merge "Fix refresh action" - Fix refresh action Fix the refresh action so that it well retriggered cds call when required, otherwise the refresh button is useless + get out the cds code from service installer Issue-ID: CLAMP-818 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ia5784d75e1bd158ff775674fe6bf0c2c39b55ad4
2020-04-23Update git submodulesChristophe Closset1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to b954df81bb47b3ff115207a2436f1b61eaeafad2 - Merge "Fix bug when adding op policy" - Fix bug when adding op policy The fix to prevent multiple op policy modle to be inserted introduced another bug, this pr fixes it Issue-ID: CLAMP-828 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I90432688df48cbf2b456efae5e4191e2909077cc
2020-04-22Update git submodulesxuegao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to f1692af8bcc02c6a7335078160463025b85eba68 - Remove bugs and vulnerabilities Remove bugs and vulnerabilities based on the sonar report Issue-ID: CLAMP-841 Change-Id: I49d0eeeedf69a0cbe3adf49cf115ab25aec7adfd Signed-off-by: xuegao <xg353y@intl.att.com>
2020-04-22Update git submodulesxuegao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to c4f54bf8f8520cb270ad3d7f8c91e12a951f138a - Guard policy clean up Remove guard policy related code, so that it will not be shown or created in the legacy policy UI. Issue-ID: CLAMP-825 Change-Id: I6c654fef9fd9df810fd48600c91ffef96db371cd Signed-off-by: xuegao <xg353y@intl.att.com>
2020-04-21Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 334ad564f969cb9d3ba1e47f5722ea43c71ee63f - Merge "Fix table pagination issue" - Fix table pagination issue The pagination issue was due to a bug in the material-ui javascript lib Issue-ID: CLAMP-803 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I9a9cf3ee373528a343f72b6c625326554ffd9965
2020-04-21Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 286492027e88f2463d6b91e670e6f5f3712888ab - Merge "Payload is expected as string in operational policy" - Payload is expected as string in operational policy 1. converted json to string for legacy operational policy 2. added payload data as default string value for generic operational policy Change-Id: If63423c24d736623b227537f0f83edeaac819215 Issue-ID: CLAMP-831 Signed-off-by: Vidyashree-Huawei <vidyashree.rama@huawei.com>
2020-04-21Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 17edc3c718345d4e2e1b045ccec776dab300abbb - Merge "Remove legacy password encryption" - Remove legacy password encryption This makes it easier to have a clean password policy on oom Issue-ID: CLAMP-796 Change-Id: Ib02e65e32daeeaeaa8faa10631dc62604734ab8c Signed-off-by: JulienBe <jb379x@att.com>
2020-04-21Update git submodulesXue Gao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to a52998489e2c38f7d443a8d7e4ff0b6a6b6acc8a - Merge "spring-web-security update" - spring-web-security update upgrade spring-web-security to a less vulnerable version Issue-ID: CLAMP-832 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ie272218e9c85b056a6bea92b3caf8072f298524d
2020-04-21Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 8b9918e7e3b1398ece5470f36be1d9dd13e29bee - Merge "Prevent adding same type of Op policy" - Prevent adding same type of Op policy Add the logic to prevent user adding the same type of Operational Policy Issue-ID: CLAMP-828 Change-Id: Iec6774ec7a9494740f7aed0873165ba073d73e45 Signed-off-by: xuegao <xg353y@intl.att.com>
2020-04-21Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to dcfbed79c6da8b9c737c979b9a0410d37142499d - Merge "Payload attributes are not displayed in operational policy" - Payload attributes are not displayed in operational policy Handled list type in response Change-Id: If4b5b45c5f23f377add1be84306a31e78d47c52b Issue-ID: CLAMP-823 Signed-off-by: Vidyashree-Huawei <vidyashree.rama@huawei.com>
2020-04-20Update git submodulesXue Gao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 3bb0a519c63cc629f5d36b29d8eeced99109353f - Merge "Release 5.0.5" - Release 5.0.5 Prepare for 5.0.5 Issue-ID: CLAMP-833 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I26aa07c55f45f666bd46dc28b8eb676e62bd40b0
2020-04-20Update git submodulesXue Gao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 700318e178976af1f492d23f1dcaeb6fa9cce46f - Merge "Upgrade dom4j to latest" - Upgrade dom4j to latest Upgrade dom4j to latest due to security issues 10 Issue-ID: CLAMP-832 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I4c3d36644cb858fdd9153b66f67ecf5f819b9381
2020-04-20Update git submodulesXue Gao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 7736a19a9906bef186fa939f5d4e4f55c2a2b22e - Merge "Release 5.0.4" - Release 5.0.4 Create a new release with latest fixes from sprint CLAMP-R6 Sprint 5 Issue-ID: CLAMP-822 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I5644e738e7936e4d1165488c9d3c97c360afc57f
2020-04-20Update git submodulesXue Gao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to b3ea086199a0121869b6106b09ac54e394435c79 - Merge "Release 5.0.4" - Release 5.0.4 Create a new release with latest fixes from sprint CLAMP-R6 Sprint 5 Issue-ID: CLAMP-822 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ia7a7bb0f73c4c7668e29d1d4b448ff2d1521e4d7
2020-04-20Update git submodulesXue Gao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 9698b59ab5eab72437d8a0f501b21da22b302df3 - Merge "Fix the get status" - Fix the get status The policy status goes to unknown because the status code returned is not good in some cases (failure with dcae comm) Issue-ID: CLAMP-827 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Iae189f62b4c7061949ffd4c842465bf5e379b669
2020-04-20Update git submodulesAshwin Sharma1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 37f482d431ebd82d1d086c99817cfb556ed55b2f - Tosca convertor updated with datetime picker plugin feature Issue-ID: CLAMP-587 Signed-off-by: Ashwin Sharma <ashwin.shyam.sharma@att.com> Change-Id: I1533b8e7a87c3e7c5af3572fef9ccd3a8fae85ef Signed-off-by: Ashwin Sharma <ashwin.shyam.sharma@att.com>
2020-04-17Update git submodulesTed Humphrey1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to df68db271f23561671a59b1678c39b8ee54cd8e4 - Minor UI fixes for dialogues and Tosca upload feature Issue-ID: CLAMP-587 Change-Id: I683b62fbd0b15ab5db18c7e1e941ff8cb58cb0f3 Signed-off-by: Ted Humphrey <Thomas.Humphrey@att.com>
2020-04-16Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 6e7d04895c9133f772f3d781e84dbfc7b32f2874 - Remove policy from PEF when removing op policy The operational policy must be removed from the PEF when the user remove an operational policy (at least attempt to purge the PEF) Issue-ID: CLAMP-824 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I793212adcfb36675c3aae9edbc077f29b14b262e
2020-04-16Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to ab3eab60a0883ffa22eb12e2b8680088c9ad25a1 - Remove policy from PEF when removing op policy The operational policy must be removed from the PEF when the user remove an operational policy (at least attempt to purge the PEF) Issue-ID: CLAMP-824 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I442c0890c391d43e8fcbdb89189d6ad2581db3af
2020-04-16Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to edaf4f9e6d0f8e1b95115cc39492c84d730ba1a2 - Add template name to UI Add template name to the UI loop viewer + change color of logs panel Issue-ID: CLAMP-826 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I6776729cefc0597067ae8ef722f7d6e488a12cad
2020-04-15Update git submodulessebdet1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 5309056d530fc14ee603c38d32290db514e03c67 - Fix bug in delete policy due to change Fix the delete policy that now fails due to isLegacy test Issue-ID: CLAMP-820 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ib21ffd419953b329feeb7c2199b7d661120178e2
2020-04-15Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 96b0450cf572772983dfb0e56503ec03f929ea83 - Merge "Fix bug in undeploy flow" - Fix bug in undeploy flow Save and flush the deploymentId and statusUrl in the undeploy flow, so that refresh dcae status will use the correct statusUrl. Issue-ID: CLAMP-807 Change-Id: If83c222f772face6f33f00bd8cf5d5c8e55ded55 Signed-off-by: xuegao <xg353y@intl.att.com>
2020-04-15Update git submodulesXue Gao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to c08fcb8fe1bbf6dc736c42f14756df242ca76d42 - Merge "Bump up clamp to 5.0.4" - Bump up clamp to 5.0.4 Bump up clamp to 5.0.4 for future release Issue-ID: CLAMP-822 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: If3fe1d2efc81576926220d578428f8db488a943e
2020-04-15Update git submodulesXue Gao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to db5bbd3947a76eb5ab5a17de263b06100d4ce42b - Merge "Fix legacy policy submit issues" - Fix legacy policy submit issues Operational legacy policy does not support semantic versionin for get status and delete policies, it has to be changed to integer Issue-ID: CLAMP-820 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I78ff69b7502900d96fcc605fe997dd564dfa3e98
2020-04-14Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 10266c923850e842e14c602d772ce2ebbc77fe89 - Merge "CDS attributes are not shown properly in UI" - CDS attributes are not shown properly in UI Handled for legacy and operational policy Change-Id: I504c4aa2531b19b09965ad1dbc03c9944931f77b Issue-ID: CLAMP-809 Signed-off-by: Vidyashree-Huawei <vidyashree.rama@huawei.com>
2020-04-14Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 0f3c8ae745988969aca1f605635b291367ecd69d - Merge "Update delete loop flow" - Update delete loop flow Updating the delete loop flow. Issue-ID: CLAMP-816 Change-Id: I9ad5001b00f5f92a8ecc1f84379ee0e8ae2d196b Signed-off-by: xuegao <xg353y@intl.att.com>
2020-04-14Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to d010fb6dbf76a785969a1e9ab8f17a0d721d69d5 - Merge "Add spinner for Deploy action" - Add spinner for Deploy action Add the spinning symbol while loop is deploying. Issue-ID: CLAMP-814 Change-Id: Id041622c300e18643e6fb725b3b5bd4ad8e9911e Signed-off-by: xuegao <xg353y@intl.att.com>
2020-04-14Update git submodulesSébastien Determe1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to d3b04701712251befc0e92d96d8812029f5e313a - Merge "Update suc alert color" - Update suc alert color Update the back groud color for succesful alert messages. Issue-ID: CLAMP-815 Change-Id: I97a621e31f2eb850eae30da3754afd3cd4ddb34a Signed-off-by: xuegao <xg353y@intl.att.com>
2020-04-08Update git submodulesLF Jenkins CI1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to d2e5008edc93220a1117df5c864d828fbae9cc8d - Automation adds clamp-architecture.rst Issue-ID: CIMAN-376 Change-Id: I53a0c54ac2c91f0510238dc5ff06bb4c410787a1 Signed-off-by: lf-jobbuilder <releng+lf-jobbuilder@linuxfoundation.org>
2020-04-08Update git submodulesJessica Wagantall1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 026042b446043e8f1cd16b11017f5732a3a16db7 - Merge "Automation adds release-notes.rst" - Automation adds release-notes.rst Add _release_notes hook to allow automation. Fix non valid release notes characters in content. Issue-ID: CIMAN-376 Change-Id: I875543052b460085fb173773b6b353b661e1272e Signed-off-by: lf-jobbuilder <releng+lf-jobbuilder@linuxfoundation.org>
2020-04-08Update git submodulesLF Jenkins CI1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to d1b4f26e6b20f47801494651f0d48c55c16b2e5d - Automation adds index.rst Issue-ID: CIMAN-376 Change-Id: Id87ada732f91fb74355bd8fb5543202e642bbee8 Signed-off-by: lf-jobbuilder <releng+lf-jobbuilder@linuxfoundation.org>
2020-04-03Update git submodulesGervais-Martial Ngueko1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 9768ccd8a3aed74b01d5646373f64b78880a7058 - Merge "Release clamp 5.0.3" - Release clamp 5.0.3 Create a release clamp 5.0.3 Issue-ID: CLAMP-819 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Iaf2bd25c6d8cae3b7079b0fb80378ae56d9aa8fc
2020-04-03Update git submodulesGervais-Martial Ngueko1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 425d25cd4ffbdae99722e6d8d38a41f2b2b365b1 - Merge "Release clamp 5.0.3" - Release clamp 5.0.3 Create a release clamp 5.0.3 Issue-ID: CLAMP-819 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ifb93b00c559aebf7d376362876354deab2ca0d84
2020-04-03Update git submodulesGervais-Martial Ngueko1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to cd46825cbd3a4ee82442ecc2873edd44cf4f4ccc - Merge "Fix pdp group info not there for legacy policy" - Fix pdp group info not there for legacy policy The operational policy legacy name must be changed so that clamp can get the right pdp group and subgroup Issue-ID: CLAMP-817 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Iaede77977b8f450c10bf7df73cf2b84a74ab122a
2020-04-03Update git submodulesGervais-Martial Ngueko1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 2cfbd6edca58330fda80ca9460fec0d66a3791a0 - Merge "Bump up clamp to 5.0.3" - Bump up clamp to 5.0.3 Bump up clamp to 5.0.3 to provide new fixes Issue-ID: CLAMP-813 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I64e1ffef8bde92f5dad52064c0d00b4c594e622c
2020-04-03Update git submodulesGervais-Martial Ngueko1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to 6aabb329d28fb5d5e4baf3fd0432b31249ee06d0 - Merge "Fix the pdp payload" - Fix the pdp payload THe pdp payload was not good in some particular cases, when the pdp group was containing different subgroups Issue-ID: CLAMP-813 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ie3e53f42827ed90689ed83b4945151cb13f38c9c