summaryrefslogtreecommitdiffstats
path: root/docs
AgeCommit message (Collapse)AuthorFilesLines
2020-03-20Update git submodulesLovett, Trevor1-0/+0
* Update docs/submodules/vnfrqts/requirements.git from branch 'master' to fa083cc3194023fc11c36629f16724af05c3b129 - Removing client command from VES 5.4.1 Event Listener Commands for event sources was never implemented, but the spec was not updated. The information is being removed to prevent confusion. Issue-ID: VNFRQTS-861 Signed-off-by: Lovett, Trevor <trevor.lovett@att.com> Change-Id: I12ef1368e2a6f84af63611d0bb839f4c840b113f
2020-03-20Update git submodulesshashikanth.vh@huawei.com1-0/+0
* Update docs/submodules/appc/deployment.git from branch 'master' to 61b1cc76a92abf7a41caa7e552ce3eeae9b707ab - Appc POC configscaleout usecase Change-Id: I9e0c81b97be563c32677b89f813a902b44a02bc2 Issue-ID: APPC-1850 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
2020-03-20Update git submodulesLukasz Muszkieta1-0/+0
* Update docs/submodules/so.git from branch 'master' to 7e5054eb95756feb5aa770c751994c27368333ac - workflowAction refactor - move variable declaration to the place where it is used - simplify the code Issue-ID: SO-2634 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com> Change-Id: I7da1dac5c24907358f0949e361edc502fe6b7092
2020-03-20Update git submodulesJimmy Forsyth1-0/+0
* Update docs/submodules/aai/sparky-be.git from branch 'master' to d30c5444bc0c0fdc37894ed5c866266522465b44 - Reverting to spring-boot 1.5 Issue-ID: AAI-2531 Change-Id: Iee6abd6cba82ffb4c376271e5e94c14e14d8ad51 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2020-03-20Update git submodulesshashikanth.vh@huawei.com1-0/+0
* Update docs/submodules/appc.git from branch 'master' to b01eb20fc1365d763cd545f1f2dd8480faece943 - Appc POC configscaleout usecase Change-Id: Ifd010541ecbd1c01729f2c9566c4d2613df60cd0 Issue-ID: APPC-1850 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
2020-03-20Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 8ce4c9110287bc375a152285fb8461bdf2f84bc6 - Merge "Release Frankfurt M4 artifacts" - Release Frankfurt M4 artifacts Release Frankfurt M4 version (0.7.0) Issue-ID: CCSDK-2166 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I9934b491fc0a04250635618f4856efdfb7b6285d
2020-03-20Update git submodulesForsyth, James (jf2512)1-0/+0
* Update docs/submodules/aai/event-client.git from branch 'master' to 5fb92bf715f6dcaf952d30edf248e259600bca2b - Release event-client:1.6.4 Issue-ID: AAI-2835 Change-Id: Iccc60d90f83e7d9a6f86eeb87eb92e494cf29302 Signed-off-by: Forsyth, James (jf2512) <jf2512@att.com>
2020-03-20Update git submodulesRitu Sood1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to 2bd2f4e76bbf7d5bce6a320ca8958fa547958a8b - Merge "Add update interface to run time context library" - Add update interface to run time context library Issue-ID: MULTICLOUD-1005 Change-Id: Ie6a8f5d83f56ea12107fdf81fe6819b1637b252a Signed-off-by: Manjunath Ranganathaiah <manjunath.ranganathaiah@intel.com>
2020-03-20Update git submodulesHagop Bozawglanian1-0/+0
* Update docs/submodules/vnfrqts/requirements.git from branch 'master' to 89b9f03f96aca30d21d5e229016e4daf16e4ec84 - Merge "Adding VES 5.4.1 Event Listener Spec" - Adding VES 5.4.1 Event Listener Spec The ONAP Frankfurt release still supports the VES 5.4.1 Event Listener format so this has been added back into the requirements, and R-570134 has been updated accordingly. Issue-ID: VNFRQTS-804 Signed-off-by: Lovett, Trevor <trevor.lovett@att.com> Change-Id: I24fb9d62314cc4e35c87b23ce57498363d2eb0f3
2020-03-20Update git submoduleskrishnaa961-0/+0
* Update docs/submodules/optf/osdf.git from branch 'master' to f30da9513ae0501f453ee93729b381270fad0a2b - Add generic conductor interface Issue-ID: OPTFRA-715 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: I84218ab65e645a90d2ff1c365bdde1e06ab27d2e
2020-03-20Update git submodulesShankaranarayanan Puzhavakath Narayanan1-0/+0
* Update docs/submodules/optf/osdf.git from branch 'master' to 420f4b3a4ca25d5de5c9318b2ca89e1ef126b278 - Merge "fix csit, cleanup dockerfile for osdf" - fix csit, cleanup dockerfile for osdf Change-Id: Ie3d44592a382ba8e886c2a7544520cbed6971f84 Signed-off-by: vrvarma <vikas.varma@att.com> Issue-ID: OPTFRA-722
2020-03-20Update git submodulesPamela Dragosh1-0/+0
* Update docs/submodules/policy/parent.git from branch 'master' to d5d53e55051e2b68357613fd512aaade5b68953c - Merge "Updated documentation for Frankfurt changes to api and xacml-pdp" - Updated documentation for Frankfurt changes to api and xacml-pdp Issue-ID: POLICY-2412 Change-Id: I3a3d6ed436e307ef20b2a41c7512478cb9c09e2f Signed-off-by: Chenfei Gao <cgao@research.att.com>
2020-03-20Update git submodulesPeyton Puckett1-0/+0
* Update docs/submodules/policy/parent.git from branch 'master' to 3e808e54db8dd62f300450989f9dcf086a62c781 - Update patch for policy parent Issue-ID: POLICY-2378 Change-Id: Ibfeceeef97cc938b39c0ff50883ee6d4d42edaa9 Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
2020-03-20Update git submodulesBrinda Santh Muthuramalingam1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to d03ffa951ba370283255f62923d761923f8294bb - Merge "virtualenv lib changed. need to pin to older version." - virtualenv lib changed. need to pin to older version. Issue-ID: CCSDK-2108 virtualenv no longer has "writefile" function, also activate_this.py has changed. we don't have time to investigate the impact right now, so doing this work-around. Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: I9503050163ba420cf0e39ded4d992a34bf5d0ae3
2020-03-20Update git submodulesAndy Mayer1-0/+0
* Update docs/submodules/externalapi/nbi.git from branch 'master' to c4b865137354f422efb46f0f6efa846d1353239d - Merge "Initial draft of Frankfurt Release notes for RC0" - Initial draft of Frankfurt Release notes for RC0 Issue-ID: EXTAPI-409 Signed-off-by: aosull01 <adrian.osullivan@huawei.com> Change-Id: Icc190c8f1d5b10902f4676b425babc46807232dd
2020-03-20Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to cf6b7be25be96cb01340f6c146e144369061cdfc - Merge "Eliminate unnecessary node ports" - Eliminate unnecessary node ports Update SDNC config to eliminate unnecessary node ports. Issue-ID: SDNC-1120 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: Ia5666fd02baa7383cc484a2e9a770907d81af128
2020-03-20Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to 6e8a70acfd0c060a7af9d549fc9656bad2fa326c - Merge "TAPI and MSA create and delete service changes" - TAPI and MSA create and delete service changes Change-Id: I06e25b82112afbe079be2ceda7aa5f6f81a39b97 Issue-ID: SDNC-928 Signed-off-by: Franklin Dsilva <franklin.dsilva@us.fujitsu.com>
2020-03-20Update git submodulesArindam Mondal1-0/+0
* Update docs/submodules/externalapi/nbi.git from branch 'master' to 4a0e63de303169e653758943858ec7fa9d52af16 - Fix sonar issues Issue-ID: EXTAPI-416 +) Format logger ++) remove toString() Change-Id: Ic119a752fa7624f4363706457e25b43d72671361 Signed-off-by: Arindam Mondal <arind.mondal@samsung.com>
2020-03-20Update git submodulesBartek Grzybowski1-0/+0
* Update docs/submodules/oom/offline-installer.git from branch 'master' to c7ad8d281bd674f4cc7e08f977eef05ea952c416 - Merge "Add necessary packages to Ubuntu Dockerfile" - Add necessary packages to Ubuntu Dockerfile Added iproute2 and python3-docker to ubuntu docker file. These packages is necessary for docker functionality in Molecule testing. Is necessary to install them because there are not in ubuntu image by default. Issue-ID: OOM-1671 Signed-off-by: Jan Benedikt <j.benedikt@partner.samsung.com> Change-Id: I4e4f6bf342da3d5acba5b7b12c2dae9d64099426
2020-03-20Update git submodulesDarraghEgan1-0/+0
* Update docs/submodules/integration.git from branch 'master' to a48752e10bd5dfa7588fe33fb7d6bff40f137731 - [INT-1450] : Documentation of PNF Software Upgrade This contains documentation for PNF Software Upgrade with direct Netconf/Yang interface with PNF Issue-ID: INT-1450 Signed-off-by: Darragh Egan <darragh.egan@est.tech> Change-Id: I58acec3baed757bdc8cad2e2588c560f31c9025c
2020-03-20Update git submodulesyangyan1-0/+0
* Update docs/submodules/modeling/etsicatalog.git from branch 'master' to 5ff788c006f00be38b80edf80945f052ffe4a62b - Upgrate etsicatalog api adapt to VFC Change-Id: Ie045e8b1594a5a1b5fc71f7bf6464745c7257aa1 Issue-ID: MODELING-346 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2020-03-20Update git submodulesBogumil Zebek1-0/+0
* Update docs/submodules/aaf/certservice.git from branch 'master' to 4b65b3c32da416ebfecb7eac808d76d89ae4b2a8 - Merge "Add certservice client to Makefile (local run)" - Add certservice client to Makefile (local run) Move files used only in local run from submodules to base dir Issue-ID: AAF-1107 Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com> Change-Id: Ia027bfb5859fb2b316215b3f2633b51666d06280
2020-03-20Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to cc75458fe01608c0350cdcaeee440b5401df8a0f - Merge "Correct defining dicts using yaml's anchors" - Correct defining dicts using yaml's anchors This commit corrects previous mistake assuming that parameter's nested content derived via "<<" operator can be overwritten with single value, while in practice, whole key would be change. For practical explanation, following entry: a: &a b: 1 c: d: 2 e: 3 x: <<: *a c: d: 10 Would yield following content: a: b: 1 c: d: 2 e: 3 x: b: 1 c: d: 10 And as we can see, "e" key is missing there. This commit correct this. Issue-ID: SDNC-1122 Signed-off-by: Konrad Bańka <k.banka@samsung.com> Change-Id: I15dfe0219ee1d6bcde7d29821ed2650bc8698244
2020-03-20Update git submodulesyangyan1-0/+0
* Update docs/submodules/modeling/etsicatalog.git from branch 'master' to b2cad09d5c19e0aa59d3b0a2afe60a4cb3b0c36c - Add etsicatalog api Add etsicatalog api for nslcm to modify package status" Change-Id: Ib54c19f5908540d233a839a36f387832f9278584 Issue-ID: MODELING-346 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
2020-03-20Update git submodulesChuanyu Chen1-0/+0
* Update docs/submodules/so.git from branch 'master' to a1403e188b01e2c10aded4a6cb7bcd9313147ed9 - Merge "resolve CSMF ServiceDecomposition problem" - resolve CSMF ServiceDecomposition problem Issue-ID: SO-2754 Change-Id: Iddcc69629a6f69d51ad7696d147bafad9121c078 Signed-off-by: hetengjiao <hetengjiao@chinamobile.com>
2020-03-20Update git submodulesChayal, Avteet (ac229e)1-0/+0
* Update docs/submodules/optf/osdf.git from branch 'master' to fa538d59b8982a48fd58f024a30a59616d43cf81 - Improvements to the OSDF changes for new PEF APIs Improvements to the OSDF changes for new PEF APIs Issue-ID: OPTFRA-723 Change-Id: Ie425bb302361489f4b5a47fbc7225fdc8060e9c3 Signed-off-by: Chayal, Avteet (ac229e) <ac229e@att.com>
2020-03-20Update git submodulesKanagaraj Manickam1-0/+0
* Update docs/submodules/cli.git from branch 'master' to feece77a2cb0e86f2df26a680657255ce0658eef - Set version 5.0.3 Issue-ID: CLI-255 Change-Id: I98d3f4bb86d1afb2ae6caddf5b29d8cf8afb109e Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
2020-03-20Update git submodulesKanagaraj Manickam1-0/+0
* Update docs/submodules/cli.git from branch 'master' to 340cfffcdbde49174052c094a8e63c01f1850672 - Merge "Make non-root user" - Make non-root user Issue-ID: CLI-255 Change-Id: Idc3e7d57ee3ab118d0ca134c171fabdfdfd071a0 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
2020-03-20Update git submodulesKanagaraj Manickam1-0/+0
* Update docs/submodules/cli.git from branch 'master' to 5dba878b4288db666c73067a8483ff993e2aff1f - Merge "Increase the http timout" - Increase the http timout Issue-ID: CLI-254 Change-Id: Icb5f38bc890205cbf21c9a60165f2c3ca65dfa9e Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
2020-03-19Update git submodulesChayal, Avteet (ac229e)1-0/+0
* Update docs/submodules/optf/osdf.git from branch 'master' to fdeaf8b56c8d342ef8145aae15c87525fe105f2a - OSDF migration to new Policy API Map policy type with constraints type for HAS payload Added new attribute policies for Network Sliciing reference Fixed the logic to proccess Attribute policy translation Issue-ID: OPTFRA-721 Change-Id: I6b01815963b48b3df97c1a3109cc39b2a8bc2c3c Signed-off-by: Chayal, Avteet (ac229e) <ac229e@att.com>
2020-03-19Update git submodulesEric Multanen1-0/+0
* Update docs/submodules/multicloud/k8s.git from branch 'master' to d08b7efcb335d892f0eb6f2c8e4a7d406a9b27fc - Add more validation methods Add more validation methods and move to package orchestration/infra/validation Issue-ID: MULTICLOUD-1029 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com> Change-Id: Id37bbb73fff9ab115ec49c88cdd3e08ee6be3098
2020-03-19Update git submodulesInstrumental1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to 083a7eb21620467ae1f7d5ba9341e12f75f9cc41 - minor 2.1.20 changes Update versions to 2.1.20 Issue-ID: AAF-1081 Signed-off-by: Instrumental <jgonap@stl.gathman.org> Change-Id: I1a8706d87f7aceffcc96980cebea6722d20cf11e
2020-03-19Update git submodulesJunfengWang1-0/+0
* Update docs/submodules/vnfrqts/requirements.git from branch 'master' to 3595d1d4a1d7274fc0dff7e469f2557eb53bcc23 - Correction of Requirement R-30278 Issue-ID: VNFRQTS-834 Signed-off-by: JunfengWang <junfeng.a.wang@ericsson.com> Change-Id: Ifaa02f9f19bb458edb38359c66294e07c2465093
2020-03-19Update git submodulesPamela Dragosh1-0/+0
* Update docs/submodules/policy/parent.git from branch 'master' to 1d8a0fbbc2543c39fad0cea3dfdca3e0e9791259 - Release policy/parent 3.1.1 Issue-ID: POLICY-2378 Change-Id: Ib1b17f78f2fc723d72269c6265196a1685b524c6 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-03-19Update git submodulesInstrumental1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to bd83422565ec450d26bea2a3112ef6b5285d20ca - 2.0.19 containers Issue-ID: AAF-1081 Signed-off-by: Instrumental <jgonap@stl.gathman.org> Change-Id: I27a3a322aecca045cbde41f3d35ebb16f49d624c
2020-03-19Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to 2569ded48e1d9f42b0b235cd19bbc44b4f602119 - Merge "Roll to Guilin release snapshot" - Roll to Guilin release snapshot Roll master branch to Guilin release numbering Change-Id: I273a6d07c7a42dd1bde4219fada701da51c40bf0 Issue-ID: SDNC-1110 Signed-off-by: Dan Timoney <dtimoney@att.com>
2020-03-19Update git submodulesKrzysztof Opasiak1-0/+0
* Update docs/submodules/oom.git from branch 'master' to ec97119b7caa591f7c199c8e60f9a2fb45548a92 - Merge "New VID certificate valid until: Mar 17, 2021" - New VID certificate valid until: Mar 17, 2021 Issue-ID: VID-784 Change-Id: I2393279cce83191e75730caaff1b57802857f0e9 Signed-off-by: Ittay Stern <ittay.stern@att.com> Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
2020-03-19Update git submodulesBrittany Plummer (bp896r)1-0/+0
* Update docs/submodules/logging-analytics.git from branch 'master' to 979dcad46b17bf071fbcfc71419795304e555e6e - Update to 1.6.7-SNAPSHOT Issue-ID: LOG-1211 Change-Id: I8ea37ba940a94dd1289de3eb758c7078d63e7d2a Signed-off-by: Brittany Plummer (bp896r) <bp896r@att.com>
2020-03-19Update git submodulesDan Timoney1-0/+0
* Update docs/submodules/sdnc/oam.git from branch 'master' to e0524603ed5d07f312fa1bdcc8ba078831c9ddfb - Merge "DG'S added for MDONS use case to handle cross domain service creation" - DG'S added for MDONS use case to handle cross domain service creation Change-Id: Ibb50d9c82cc6f62c58c8e85b7f088d40c2a7e30d Issue-ID: SDNC-928 Signed-off-by: Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com>
2020-03-19Update git submodulesSebastien Premont-Tendland1-0/+0
* Update docs/submodules/ccsdk/cds.git from branch 'master' to 0562fc1c7378be67b571bb142489272a6b1b3814 - Fix kotlin cache lazy loading When USE_SCRIPT_COMPILATION_CACHE is set to false the classLoader is closed after the class is instantiated. This is causing an issue when lazy loading is happening during the script execution. Lazy loading occurs when a suspendible function returning something is called from "processNB", kotlin will create a second class that will be loaded during execution (needs to be in the classpath during execution). Issue-ID: CCSDK-2150 Signed-off-by: Sebastien Premont-Tendland <sebastien.premont@bell.ca> Change-Id: I64780287352d762325662e0e5d5b94038dedee7f
2020-03-19Update git submodulesJimmy Forsyth1-0/+0
* Update docs/submodules/aai/event-client.git from branch 'master' to ebfe8ca453cfd9da2a8ed126cbd55b2fe5cf5166 - Use aai-parent:1.6.10 Issue-ID: AAI-2835 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: I663dd3befd0487f9d94463fec853e47aa4297ac6
2020-03-19Update git submodulesAijana Schumann1-0/+0
* Update docs/submodules/ccsdk/features.git from branch 'master' to bc9425a00d19b75b149fbbf0c4ea7345de8721d5 - Bugfixes for PerformanceApp Fix filter in table not always showing Fix suspectInterval filter not linked between chart and table Fix data not loaded problem Issue-ID: SDNC-1118 Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com> Change-Id: I7d1b71f094dfdd7cd16ed6f7fb5c597a7b209b69
2020-03-19Update git submodulesInstrumental1-0/+0
* Update docs/submodules/aaf/authz.git from branch 'master' to 6a1ddb5e38cf8fa29f84c4b6ac4172bc1063691a - Fix standalone Batch Jars Issue-ID: AAF-1114 Signed-off-by: Instrumental <jgonap@stl.gathman.org> Change-Id: I6ceb7ef714b3c7c2b33371abfca9202746151231
2020-03-19Update git submodulesxuegao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to c405a83ec84c2bc1c090f06f9ac6207469e09cbb - Fix loop submit bugs Update the payload for policy creation and pdp group activation and update the policy url accordingly. Issue-ID: CLAMP-787 Change-Id: If39eeaccf780f1222b99ffc4dd5d7ef1460c4962 Signed-off-by: xuegao <xg353y@intl.att.com>
2020-03-19Update git submodulesxuegao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to a2625fe6c6819fc41a6f4f5a9625cd9ba753bc72 - Fix modify model UI bug Fix the modify model UI bug, update the loopCache before closing the window. Issue-ID: CLAMP-783 Change-Id: Ide103f66b103ca2f51e8b7bbeda883db6626d027 Signed-off-by: xuegao <xg353y@intl.att.com>
2020-03-19Update git submodulesxuegao1-0/+0
* Update docs/submodules/clamp.git from branch 'master' to fa1e4db9078caa149ab6d19697d5863b1103aaa8 - Fix pdp group bug Update the url used to get the pdp group info from Policy. Issue-ID: CLAMP-782 Change-Id: I283f4296ea0efaea475e1c142979a0754feb1a19 Signed-off-by: xuegao <xg353y@intl.att.com>
2020-03-19Update git submodulesBrittany Plummer (bp896r)1-0/+0
* Update docs/submodules/logging-analytics.git from branch 'master' to 18be8c9c1da51cb38a6ec797f77265cf877b8db1 - Release 1.6.6 Issue-ID: LOG-1210 Change-Id: Icfa033eac661c19e2a72f1987afcaaf8b29f1c85 Signed-off-by: Brittany Plummer (bp896r) <bp896r@att.com>
2020-03-19Update git submodulesa.sreekumar1-0/+0
* Update docs/submodules/policy/parent.git from branch 'master' to cc0e917ff2fba38585b0064517409968f66a2a7e - APEX Documentation changes for Frankfurt release Change-Id: Idb7f768f04269a25222ed649e2e59973286aefbc Issue-ID: POLICY-2424 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2020-03-19Update git submodulesKonrad Bańka1-0/+0
* Update docs/submodules/oom.git from branch 'master' to f2158a2f746b9170551bb214bedcd2e897fd8a76 - Correct distribution addresses of SDC artifact Issue-ID: MULTICLOUD-1036 Signed-off-by: Konrad Bańka <k.banka@samsung.com> Change-Id: I3c1d23417f721dd50ed2255dfdf3ee83e7d11fa7
2020-03-19Update git submodulesKonrad Bańka1-0/+0
* Update docs/submodules/oom.git from branch 'master' to cf5b02e2725594f7cc22095b2e372c06fb7fa862 - Correct distribution addresses of SDC artifact Issue-ID: MULTICLOUD-1036 Signed-off-by: Konrad Bańka <k.banka@samsung.com> Change-Id: I81161664e257fc4d5c459ee6255ffa5e3f4371c7