Age | Commit message (Collapse) | Author | Files | Lines |
|
* Update docs/submodules/oom.git from branch 'master'
to 8a5938824366fa06d5426e14862ee61df33e6903
- Merge "[SDNC] Use faster version of common secret templates"
- [SDNC] Use faster version of common secret templates
Issue-ID: OOM-2051
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: I6cf72e3d6dcd8eab5f913b86febc7a21d02c1ecb
|
|
* Update docs/submodules/oom.git from branch 'master'
to b283d79b9031efdda2ff88f4cf4959837b9feaa4
- Merge "Fix mount point for SCH tls-init container"
- Fix mount point for SCH tls-init container
Issue-ID: DCAEGEN2-2177
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Change-Id: I470ba4fbcb0521069eda8b3296fe303c1b3c90b5
|
|
* Update docs/submodules/oom.git from branch 'master'
to 62b927f8ac6b15387ec9828cccb51bef67298b5a
- Merge "Update CLAMP deployment for Frankfurt release (RC0)"
- Update CLAMP deployment for Frankfurt release (RC0)
Update the SQL and settings of Clamp + set the docker image to current release
Issue-ID: CLAMP-795
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Idaa4935516237221c90c4cf9141136fa1e104a02
|
|
* Update docs/submodules/oom.git from branch 'master'
to 1b6875ac94561f437050b8b33328e9c9720f1a57
- Merge "Add server cert info for AAI mS"
- Add server cert info for AAI mS
haproxy, resources, traversal, schema-service, graphadmin,
babel, model-loader, aai-search-data
Issue-ID: AAI-2821
Change-Id: I4304053534a20ea1b51e05e285f0829403d2b2db
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
|
|
* Update docs/submodules/sdc.git from branch 'master'
to 407bbefe5b0b932f6c6bed65193815c78b4d41b5
- Add 'required in runtime' for service inputs
User may want to set required to true for some inputs
so that make sure those input values are given at service
instantiation time.
By this change 'required in runtime' column is introduced into
service inputs table in Properties Assignment screen
and user can select required true/false for each input.
Change-Id: I0d676d2d20e02c975d51c7f4d2bb63c699743d66
Issue-ID: SDC-2659
Signed-off-by: Satoshi Fujii <fujii-satoshi@jp.fujitsu.com>
|
|
* Update docs/submodules/vnfrqts/requirements.git from branch 'master'
to 1e9417a22ea4ec8f58e1ba100d9096312b1c4729
- Correction of requirement R-025941
Issue-ID: VNFRQTS-866
Signed-off-by: JunfengWang <junfeng.a.wang@ericsson.com>
Change-Id: I952e1256c0a544af2b7655499512a83b11c95e03
|
|
* Update docs/submodules/so.git from branch 'master'
to 1abba93dea5053711929f8c18bb922cd31b10bf5
- Merge "Fix for SO-2678"
- Fix for SO-2678
Change-Id: I2eea767e451e8570e6cc40d2ade3b8c6661f0a8b
Issue-ID: SO-2678
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
|
|
* Update docs/submodules/ccsdk/cds.git from branch 'master'
to 95dcac20af9c1f59c3c0d8de7ad4d253ecb58776
- Roll to next Frankfurt snapshot and fix sonar build
Roll to next Frankfurt snapshot. Also, fixed config to skip sonar
for error-catalog, which has no scannable components. Sonar builds
were failing because error-catalog does not have standard maven
source and test directories (src/main, src/test)
Issue-ID: CCSDK-2152
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Iacb76b240e71206de8306af7e2447eaa07b0d33b
|
|
* Update docs/submodules/so.git from branch 'master'
to 32b6e452ab34939da6eb7ee23ea18244cff147ac
- Add validations to prevent out of order deletes
Add validations to prevent out of order deletes
Add additional junits to all validations
Remove tests that are not longer needed
Issue-ID: SO-2772
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I00b8490691181bc1e95da25c73e0f215e1c2b0e2
|
|
* Update docs/submodules/oom.git from branch 'master'
to a52d0c03906640203429d1b713261028db835eba
- Merge "[UUI] Upgrade uui version to 3.0.1"
- [UUI] Upgrade uui version to 3.0.1
Issue-ID: USECASEUI-422
Change-Id: I2fa0c9486dd02516e5cd7bd9c3fcdae927d7a73b
Signed-off-by: hekeguang <hekeguang@chinamobile.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 22872ddddd3c4e3646a2d01d42b534fdea469b8d
- Update BBS use case documentation
BBS use case documentation needs additional updates in Frankfurt release
Issue-ID: INT-1444
Signed-off-by: Pérez Caparrós David, INI-ONE-MBL-MEE <David.PerezCaparros@swisscom.com>
Change-Id: I5d44898f4e7d7d628181a0140b7b13d8b57a8170
|
|
* Update docs/submodules/oom.git from branch 'master'
to 0674d67ac6c1ff4e82a1d7930999385a9fc90ca8
- Update git submodules
* Update kubernetes/aai from branch 'master'
to 40aacd4952fc1d8a37f4ad44c89bef093762b81c
- Add PNF to tosca mappings
Issue-ID: AAI-2845
Change-Id: Iaf2474b38ea1b5a47d5dad7154fef0d0fd4beb68
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
|
|
* Update docs/submodules/dcaegen2.git from branch 'master'
to 8d44c1bb2b6e7b7bf85341bb5123c4f2bff62b53
- Merge "bbs-ep documentation updates for DCAEGEN2-2105 - flowchart update"
- bbs-ep documentation updates for DCAEGEN2-2105 - flowchart update
Remove the check for RGW MAC address from CPE authentication flowchart
(aligning with the trigger policy change in event/processor/pipelines/CpeAuthenticationPipeline.java)
Change-Id: Ib4b53479d44c5d76dce9bb523d37b7417e7fd86c
Issue-ID: DCAEGEN2-2105
Signed-off-by: Geury <jean-yves.geury@nokia.com>
|
|
* Update docs/submodules/externalapi/nbi.git from branch 'master'
to c8668c7cc6a38f454d24562050750cadfd323a6b
- bump to 6.0.1 for RC0
Issue-ID: EXTAPI-422
Signed-off-by: aosull01 <adrian.osullivan@huawei.com>
Change-Id: Iaefe00cf48d0126d336e6d2b70aea87356780c23
|
|
* Update docs/submodules/dcaegen2.git from branch 'master'
to eec78e919705108f867ff9e68fe8017d88247b38
- Merge "Add datalake deployment guide."
- Add datalake deployment guide.
Issue-ID: DCAEGEN2-2028
Signed-off-by: Kate Hsuan <kate.hsuan@qct.io>
Change-Id: I882ad3e9b33f03fe7df98b8cc89c507fbd8062e6
|
|
* Update docs/submodules/oparent/cia.git from branch 'master'
to f6b214820507ff8c475dc0366a38aebd5aa14d96
- Migrate oparent-cia docs
Merging this will create
https://onap-oparent-cia.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: Id3d179f857cf1759f9254c2cba2bd18672794787
|
|
* Update docs/submodules/ccsdk/distribution.git from branch 'master'
to 8ef1117acc1ed77127d06b03ab37b9413d114b7a
- Fix log location
Update sliboot docker to log to standard ONAP directory
(/var/log/onap/{project})
Change-Id: I932d48ee658ebd4236ea67eab1f6769e6d50013d
Issue-ID: CCSDK-2186
Signed-off-by: Dan Timoney <dtimoney@att.com>
|
|
* Update docs/submodules/ccsdk/apps.git from branch 'master'
to 7f0132ec5d305c4f63b75dee8108c498bf28755b
- Roll to Guilin release
Roll to Guilin release numbers
Change-Id: I31f0aaa9ef5649a65e2978c075aa0b64d64e55fd
Issue-ID: CCSDK-2152
Signed-off-by: Dan Timoney <dtimoney@att.com>
|
|
* Update docs/submodules/appc/deployment.git from branch 'master'
to aa228059d4b485730eca02d75f482683bf333c42
- Update APPC certificate
Issue-ID: AAI-1836
Change-Id: Ie89eb7f1c779aec67f85d1c6944ea666c4069801
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to df5f83eef26b23a5381e134ff50f89b340376596
- Merge "convert openstack to external tasks"
- convert openstack to external tasks
Use external tasks to communicate with openstack adapter
Will be more resilient to failures
Refactored all flows to use external tasks not REST calls
Rollback is now an external task
Ensured backwards compatibility
Issue-ID: SO-2767
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I8afdb89c688d756aed0f25f7d9a7fb898142554d
|
|
* Update docs/submodules/so.git from branch 'master'
to 8d23a63762dcd0d435463fa25c64f146d52dc981
- Merge "initial commit of testing of grabbing cvnfc cust"
- initial commit of testing of grabbing cvnfc cust
initial commit of testing of grabbing cvnfc cust
Update SQL so it properly inserts test data
remove unnecessary test in mso catalog db
updated tosca resource installer to use list not set
fixed compilation issue in asdc rest interface test
Issue-ID: SO-2769
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I9c6e7b6cbb96d9f395903a5a54b5af567eba62f8
|
|
* Update docs/submodules/sdc.git from branch 'master'
to 4f02f33f309c3869d231926582f559aa04816063
- Increase test coverage
Change-Id: Ibc6134e5954537258541ff018dc9794191d4e907
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-2833
|
|
* Update docs/submodules/oom.git from branch 'master'
to c53ff54815a8d716c12395293a8c75a5b6a7fa91
- [SO] Use common secret template in so
Generate passwords for:
- so_user
- so_admin
and distribute them to all SO subcharts.
mariadb-galera root password is taken as a reference to existing
secret (shared mariadb instance) or also generated if local cluster is
used.
Three other DB users also have generated passwords but they are not
distributed outside of so-mariadb as they were never used.
Issue-ID: OOM-2328
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: Ic4af5c9b12b00d2a52d2597e3fe1161d0d1a9f20
- [SO] Use common secret template in so-mariadb
When porting so-mariadb component I've not noticed a few DB
credentials hardcoded in shell scripts...
Let's fix this and move all of them to common secret template
Issue-ID: OOM-2328
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: I8b42b22b1eb67ee8f15aebf0f4fccaa62cf6fde5
|
|
* Update docs/submodules/clamp.git from branch 'master'
to 508a8781ffa9ce323a7e57e13fa5708ad005d2f0
- clamp release 5.0.1
Bump up clamp to 5.0.1 for new release
Issue-ID: CLAMP-800
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Icecdf64ba19e0f024e7950dc200813b67ad54366
- clamp release 5.0.1
Bump up clamp to 5.0.1 for new release
Issue-ID: CLAMP-800
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I9bb72ba680cc084366eaf43eb2c624ea6b06f9c7
|
|
* Update docs/submodules/so.git from branch 'master'
to 7afcb6b9c3be874059580ef75158ebecedfb6bc9
- Move the groovy script to the right folder
Move the groovy script to the right folder
Issue-ID: SO-2368
Change-Id: I9bf70d038c2893115e9cfd728e6d1ceafb94e2c1
Signed-off-by: chenchuanyu <chenchuanyu@huawei.com>
Change-Id: I01f4a31808626ecb91cf1b2b25131e5edee308ad
|
|
* Update docs/submodules/clamp.git from branch 'master'
to 1f613808ed283069fe6d0eaa55420c6166e88782
- Fix the AAF issue
Fix the AAF due to wrong urls specified in the cadi filter. Permissions were therefore not added
Issue-ID: CLAMP-799
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ibd96ebcdbabe85b891dc023cf087c57cee1fdddb
|
|
* Update docs/submodules/usecase-ui.git from branch 'master'
to c67fdd8d12935a5f866929f6d024471b223db801
- Since version 3.0.1 needs to be self released, the corresponding configuration files need to be modified.
Issue-ID: USECASEUI-422
Change-Id: I3010372eeb86d6fa1b53576d0262a4345d398b5f
Signed-off-by: hekeguang <hekeguang@chinamobile.com>
|
|
* Update docs/submodules/vid.git from branch 'master'
to 51abe8acdd924bb3ad260966723210b6d5b8e870
- add test that verify delete and upgrade of the not upgraded vfm's
add cypress test that verify delete and upgrade of the not upgraded vfm's on a single click
Issue-ID: VID-798
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: I293779c3bd48215b6830a99be9a423ce7cb29a5d
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
|
|
* Update docs/submodules/msb/discovery.git from branch 'master'
to 14d5316954795b00942f435d8ed9af7c64341350
- Release docker
Issue-ID: MSB-463
Signed-off-by: Huabing Zhao <zhao.huabing@zte.com.cn>
Change-Id: If8061515c87a9d4ede311b64408184bffdfdcdf4
|
|
* Update docs/submodules/sdc.git from branch 'master'
to ee80eb11d8ace0117ea1084c5ac16d8d271b8fd9
- Increase test coverage
Change-Id: If9b371042a42213f38828f9628714d076261f25c
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-2833
|
|
* Update docs/submodules/sdc.git from branch 'master'
to 7422f22140b7ce24e3e735dabaa325e2f7a4fc92
- Initial fix for https call to plugins
Creates an http/https client to check whether plugin is online. missing UI fixes still
Issue-ID: SDC-2843
Signed-off-by: ilanap <ilanap@amdocs.com>
Change-Id: I06ee08c73881c8a8c458198f9b6a0f9df1021f52
Signed-off-by: ilanap <ilanap@amdocs.com>
|
|
* Update docs/submodules/sdc.git from branch 'master'
to 8d82a514707fb0853d6a2c6d8f7408a872e727ca
- Fix unit tests
Added asserts where required, add tests.
Replaced getters-setters with Lombok annotations.
Fixed incorect SUT in the tests.
Removed default constructors used only for tests.
Change-Id: I9be29d9c0d891039952178a3c3e1c3a2062d1382
Issue-ID: SDC-2856
Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to fe63e21aa31ce962ba37944f27cecfdeee0a4c0d
- Merge "workflowAction refactor"
- 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: I3b43bed09f312a55b1990cdbb91ca5d5c09f5038
|
|
* Update docs/submodules/vid.git from branch 'master'
to 38cdcc547e392126622c576f4b55424762d6d0a0
- Merge "add cypress test that verify deletion of the not upgraded vfm"
- add cypress test that verify deletion of the not upgraded vfm
Issue-ID: VID-795
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: I9761ccdc3eb3bb06054ddaad06bc56ace9279e2b
|
|
* Update docs/submodules/sdc.git from branch 'master'
to 4819f02aa3b628294196340a119cd6976a159757
- Support 50 Characters for VSP Name
Change-Id: I02ddb9d67669e2ecca02762a4bb9862bf28df3cb
Issue-ID: SDC-2854
Signed-off-by: Tufman, Shay (st198j) <st198j@att.com>
|
|
* Update docs/submodules/vid.git from branch 'master'
to 81c3ee59ef8196cc349bcff46f9e14a08bb16ec6
- Configure c3p0 liveness check of ext-svc-simulator
Check the viability of ongoing connections quite rapidly, allow
stable log-ins while tests.
"Your application should experience broken or stale Connections only very rarely"
- https://www.mchange.com/projects/c3p0/#simple_advice_on_connection_testing
Issue-ID: VID-647
Change-Id: If5f3683a781c2c3bccb7b118ec96205000ee4547
Signed-off-by: Ittay Stern <ittay.stern@att.com>
|
|
* Update docs/submodules/aaf/authz.git from branch 'master'
to f146d1bbc6a2b072e5fc1cdc358bf9534b90fd51
- 2.1.20 Container release
Issue-ID: AAF-1102
Signed-off-by: Instrumental <jgonap@stl.gathman.org>
Change-Id: Ie9e11ea8bd42d4011e91bb4d8218160ea1f5c59d
|
|
* Update docs/submodules/so.git from branch 'master'
to d142602d51950702bc3e16fabad80bffc3c619ab
- Merge "Add test for CreateSliceService flow"
- Add test for CreateSliceService flow
Issue-ID: SO-2368
Cover prepareDecomposeService, processDecomposition,
prepareCreateOrchestrationTask, sendSyncResponse
Change-Id: I9f36c8055b708f0c04acbf1d575dfcc2da5ed55d
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
|
|
* Update docs/submodules/optf/cmso.git from branch 'master'
to ffae1a93274931e68d491736f01e8573e671c748
- Fix optf-cmso sonar reports
Change-Id: Ie4bae1ac7c4732c82023aba9adcee7c110145257
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-694
|
|
* Update docs/submodules/optf/osdf.git from branch 'master'
to 92bd95aa75188da3ae34492a9a0196fe567c3e23
- optf-osdf creating a new release tag
Change-Id: Ibb0826f3da6a3a1a6fd23e1fe634c9a04cd2485f
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-729
|
|
* Update docs/submodules/optf/osdf.git from branch 'master'
to ddac631c097167df890cf6814df301b61a0815c7
- optf-osdf pod failing to start in k8s env
Change-Id: I4c9f4f5df5462419e39b063666ff5f5187ad71ef
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-729
|
|
* Update docs/submodules/oom.git from branch 'master'
to 032e4e3909f1bc504d23cda2c6e90b59b08d6d2c
- Merge "policy changes pre-1st policy release in frankfurt"
- policy changes pre-1st policy release in frankfurt
Miscellenous changes to keep up with all necessary oom
modifications to support first set of released deliveries.
PS1,PS6: PDP-D offline support.
PS2: PDP-D PDP Group support. When PDPs register with PAP,
they now have to specify their PDP group. Added the default
group to the config file.
PS3: PDP-A config file changes to add PDP group and
native policy type.
PS4, PS6: API add new preloaded policy types.
PS5: Set snapshot versions for current release testing.
PS[7-9]: https dmaap support for pap,pdp-x,distribution,pdp-a.
PS10: PAP healthcheck configuration.
PS11: Update LICENSE headers.
PS12: Preload onap.policies.controlloop.operational.Common
operational type.
PS13: PDP-D drools base.conf remove JAVA_HOME
PS14: add preloaded operational policies for apex in api component,
and JDK 11 for legacy engine components.
PS15: apex updated supported policy types, and remove duplicate
preloaded policy type from api (operational Common).
PS16: added api preloaded policy.
PS17: distribution + more api preloaded policies
PS18: amsterdam.pre.sh point to pdpd-cl-entrypoint.sh
PS19: rebase and remove references to amsterdam in drools (deprecated)
PS21: replace url with host/port for new actor design
PS22: add trailing "/" to context URIs
PS23: restore SO_URL as it may be needed for old actors/rules
PS24: update to released images
PS25: updated brmsgw.conf to latest images
Issue-ID: POLICY-2296
Change-Id: I52232f65db19a50dd3c9baf052242c6d79675264
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Signed-off-by: Jim Hahn <jrh3@att.com>
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
|
|
* Update docs/submodules/policy/engine.git from branch 'master'
to 068d0f8fe17d13e4f3000b1c9033675068e5532e
- Point to released snapshots
Issue-ID: POLICY-2378
Change-Id: I6213bdf4a5c3a83312f0bb2926474e4f3acaa681
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
|
|
* Update docs/submodules/oom.git from branch 'master'
to b0cd62150e80094eb97ae22d4b0b9cb54545840d
- Merge "[POLICY] Use common secret template in drools"
- [POLICY] Use common secret template in drools
Use common secret template in drools module instead of putting db
credentials in a single secret file to allow usage of external secret
mechanism.
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: I377b71d76b0b37e919ea841586bb6d5c22107952
|
|
* Update docs/submodules/clamp.git from branch 'master'
to c5fef2bba60c7f7c5c2da01ff2359f7c9376af13
- Merge "Release Frankfurt 5.0.0"
- Release Frankfurt 5.0.0
Release Frankfurt 5.0.0 images and jar
Issue-ID: CLAMP-795
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: If885758b448aa71cbb626ea7770baf4f378a65c2
|
|
* Update docs/submodules/integration.git from branch 'master'
to 6bdc9faaa21f823cbb64d713e2d0c1fa3abe410b
- Set SKIP_LINT=TRUE to speed up installation
Issue-ID: OOM-2335
Signed-off-by: Marco Platania <platania@research.att.com>
Change-Id: I803781947a9fe84e153cdbd6f94d9f21b8bcdb6f
|
|
* Update docs/submodules/so.git from branch 'master'
to 026f119488590eb4b96a202fcc9490a91b2da01b
- bump the version to 1.6.1
Issue-ID: SO-2519
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
Change-Id: I24c8f30e6f640234b7ee4242079fad44281791db
|
|
* Update docs/submodules/so/libs.git from branch 'master'
to 720654dcb4ec033cf16892d1aa730100f057ff61
- bump the version of the libs to 1.6.1
Issue-ID: SO-2519
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
Change-Id: I2108afe415472a79f686cd434b58320ffccd0a6f
|
|
* Update docs/submodules/ccsdk/distribution.git from branch 'master'
to 80d0edc969784b39aa8643ca8f029a6c4eab8b17
- Merge "Add new sliboot container"
- Add new sliboot container
Add new docker container for springboot-based SLI
Change-Id: I2cb767e04206b56804169ae37f015ebc0b5e8f60
Issue-ID: CCSDK-2186
Signed-off-by: Dan Timoney <dtimoney@att.com>
|
|
* Update docs/submodules/ccsdk/cds.git from branch 'master'
to 0e5af945fc7283c9feb2e1326eb50e33e949ffe7
- Deactivating spring data jpa from SDCListener
1-Deactivate spring data jpa from health check common project
Issue-ID: CCSDK-1669
Signed-off-by: shaaban Altanany <shaaban.eltanany.ext@orange.com>
Change-Id: Ib59e9b11b948fd584ddc65da560a65328d885501
|