Age | Commit message (Collapse) | Author | Files | Lines |
|
* Update docs/submodules/so.git from branch 'master'
to d178938c12d54bc17c3c674b29d4c464f059de33
- Fix macro delete instance bug.
Fix macro delete instance bug. vf-modules not being sorted correctly
because isbaseboolean field is not being set.
Change-Id: Id196e152977d922bee6c9bb797ad240bb70fbf47
Issue-ID: SO-2053
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
* Update docs/submodules/appc.git from branch 'master'
to 066fc4828dd8e0dd9e6c0e9cc7e7dd705f02f7c1
- Parameterized queries
Convert all database queries to use java sql
parameterized queries to reduce risk of sql
injection attack.
Change-Id: I15876ce3a2f2e2dfbd6578f5141367deed75d097
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: OJSI-25
|
|
* Update docs/submodules/music.git from branch 'master'
to 960971d2b7cb4915925ea37ecc78e484b42d51af
- Merge "Update Netty Library version"
- Update Netty Library version
Issue-ID: MUSIC-406
Signed-off-by: Nelson, Thomas (tn1381) <tn1381@att.com>
Change-Id: I088f6e727ad10971e245508ba862272d43170080
|
|
* Update docs/submodules/music.git from branch 'master'
to aa08eecf40d1f5f49d84cd51e7d6f91789ab6adc
- Merge "Sonar fixes for MusicApplication"
- Sonar fixes for MusicApplication
and util files.
Fixed Testing issuse
Update Gitignore to include vscode.
Issue-ID: MUSIC-419
Signed-off-by: Nelson, Thomas (tn1381) <tn1381@att.com>
Change-Id: I202613f905e2ef0cde338e7c98074faf68bc649a
Signed-off-by: Nelson, Thomas (tn1381) <tn1381@att.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 17314cd2c1e0ae88cc460d96e3731a72dd3a37d9
- Add integration and oom branch params in deploy.sh
Issue-ID: INT-1117
Signed-off-by: Gary Wu <gary.wu@futurewei.com>
Change-Id: I47d33ffeeb739a6f6fe3b768ccfd147add1de254
|
|
* Update docs/submodules/policy/parent.git from branch 'master'
to c68e73d68f840e81792e6ec51520900bfd3f0ea0
- Update docker documentation for El Alto
All now use the docker maven plugin.
Issue-ID: POLICY-1849
Change-Id: Ifcf1ab86938917839455fdc0014aa214ecd09d35
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to 5c58eeca5ffd8b080b9af7619a903eb0acff3a0d
- Changed dependency back to 1.3.0
sdc-distribution-client changed back to 1.3.0
Change-Id: I53fd206c16bdb9c22976b6b671784841923b5295
Issue-ID: SO-2078
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
* Update docs/submodules/policy/apex-pdp.git from branch 'master'
to ce9d82d2c0e863597d84cc8909955e398405f45a
- Add passthrough properties for APEX engine
APEX event receiver and sender plugins sometimes need to exchange
information with tasks, especially in the case of REST communication.
This change enables passthrough of Properties from the event carrier
technology plugins to APEX task, task selection, and state finalizer
logics.
Apologies for the size of the review but this change involves passinng
the properties through all the APEX components, hence the large number
of small changes.
Issue-ID: POLICY-1742
Change-Id: I219fd69550f06702ef64adbb165fe7baac422e96
Signed-off-by: liamfallon <liam.fallon@est.tech>
|
|
* Update docs/submodules/sdc.git from branch 'master'
to 4318fb7e9965f82e27e7e7856be6c5a97117b628
- Add unit tests for ComponentDependencyModelErrorBuilder
Issue-ID: SDC-2327
Signed-off-by: Marcin Kowalski <m.kowalski3@partner.samsung.com>
Change-Id: I48a1b56d3d193dd5a85d4331c31b1913d0997ec3
|
|
* Update docs/submodules/sdc.git from branch 'master'
to d9cf49c2c91284a9ac48aba0e8ab7d80275a5b97
- Upgrade jackson-databind
Upgrade jackson-databind version.
Change-Id: Ica3cd492404150786f212f126463af51fc95b071
Issue-ID: SDC-2262
Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
|
|
* Update docs/submodules/sdc.git from branch 'master'
to 073d324c23d05562a0a0feded5730226d4864ab8
- Add unit tests for HealthCheckService
Issue-ID: SDC-2327
Signed-off-by: Marcin Kowalski <m.kowalski3@partner.samsung.com>
Change-Id: Ia72210625c45b4e9b7bd5d26aa52893167133a93
|
|
* Update docs/submodules/aaf/authz.git from branch 'master'
to f6f44f558ce4f04605269f71a10d6df054295f6a
- SONAR flagged fixes
Issue-ID: AAF-857
Change-Id: I0b2d6b985fd7f8abc3d133d6db37865aa300e75f
Signed-off-by: Instrumental <jonathan.gathman@att.com>
|
|
* Update docs/submodules/sdc.git from branch 'master'
to f4dcec3859d8ab1a0ac1559d5c5e27e059d06e4f
- Fix for Cassandra init
Change-Id: If266342c3c126d79e5d99a70f4ed3908e4e7a166
Issue-ID: SDC-2371
Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
|
|
* Update docs/submodules/oom/offline-installer.git from branch 'master'
to 34cd508b725d6bd13fcc6957a4d063b5607e811f
- Removing http data list
New policy framework in Dublin is offline friendly and does
not require collecting maven artifacts in runtime from
internet. We can exclude this step from our offline platform
and it was verified using vFWCL demo.
Change-Id: I284b114d70fa73362eb603286bcb98ce1e2367c0
Issue-ID: OOM-1900
Signed-off-by: Michal Ptacek <m.ptacek@partner.samsung.com>
|
|
* Update docs/submodules/vid.git from branch 'master'
to fd34d59d1dfb6cff996a1d356640b6576687a995
- Fix for overlapping vnf name
Remove 'position' tag from vnf-versions-name class as it blocks text wrapping
Change-Id: Ic2e4bfedb0f1bc8a9b1a59769c73caec7d7388b7
Issue-ID: VID-506
Signed-off-by: Wojciech Sliwka <wojciech.sliwka@nokia.com>
|
|
* Update docs/submodules/policy/distribution.git from branch 'master'
to 4429dc73ff9560ac6531bb6a58cbc9e2254325bc
- Merge "Remove POLICY_DISTRIBUTION_HOME in Dockerfile"
- Remove POLICY_DISTRIBUTION_HOME in Dockerfile
Update the policy-dist.sh and Dockerfile according to the comments in
commit: https://gerrit.onap.org/r/c/policy/api/+/89972
Issue-ID: POLICY-1702
Change-Id: Ia3d2ce356baac3a657da879fb9ccf5eefd2a9624
Signed-off-by: shaoqiu <tim.huang@est.tech>
|
|
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master'
to 19ed1a22bfecf7e6c4f714d5ca5be422dd52c6f7
- Fix resp status for term ns
Change-Id: I02dda46d4e42d4e806602d34e4badb37789ee9ba
Issue-ID: VFC-1431
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
|
|
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master'
to 6ee1843804237ee73147ac64ea61fc2a30c2191e
- Fix resp status for update ns
Change-Id: I01e28465a4da6f13fb893749f867b8e82301c16f
Issue-ID: VFC-1431
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
- Fix resp status for inst ns
Change-Id: Id4e45f09488edf814cd1eaff6b24547c13345168
Issue-ID: VFC-1431
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
|
|
* Update docs/submodules/dmaap/datarouter.git from branch 'master'
to 8f28bfe406b657c924440dcee6e3d7b302ce639c
- Merge "Adding to unit test coverage"
- Adding to unit test coverage
Change-Id: Id8d07c94bb70952fb317bfc7824fc0d587087468
Issue-ID: DMAAP-1203
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
|
|
* Update docs/submodules/dmaap/datarouter.git from branch 'master'
to 8528bac26723e619901f4020848b2cf05538f43d
- Merge "Re-adding version to parent pom"
- Re-adding version to parent pom
Change-Id: I117c46db28188d30892e14419061664a9dad25ec
Issue-ID: DMAAP-1210
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
|
|
* Update docs/submodules/dmaap/datarouter.git from branch 'master'
to 25d9192ad233ee72f93ca6002e8c80d03dc4efd1
- Merge "Adding more robust file deletion"
- Adding more robust file deletion
Change-Id: I39675f77c101e55f6a8eba18cabb5f282081d032
Issue-ID: DMAAP-1212
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
|
|
* Update docs/submodules/policy/distribution.git from branch 'master'
to b2f1e97eaa7d3e7f115c358caa0bbf49a46d737b
- Fix distribution latest tag
Eliminating the patch - using Rashmi's changes.
Issue-ID: POLICY-1737
Change-Id: I4a790b3da6de823bb744af270f541c0699ed8092
Signed-off-by: pdragosh <pdragosh@research.att.com>
|
|
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master'
to ddec98c21519df7e044c761bfed70d37412572dd
- Fix resp status for create ns
Change-Id: I47283a2931136457c96a9d5c25ee7f7a86706cb4
Issue-ID: VFC-1431
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 5ee1c3899f07e6eb22f73ed39588ea73c4599038
- Add a known issue in vCPE doc
Signed-off-by: Yang Xu <yang.xu@futurewei.com>
Issue-ID: INT-1127
Change-Id: I3354f5a468c79c83a40550fd8bcb20f9858b37a8
|
|
* Update docs/submodules/vfc/nfvo/lcm.git from branch 'master'
to 52538e341f82ffea2c077440200888f747a8b185
- Refactor codes for create subscription
Change-Id: I7e2242a13d201ce9170b7f8511c2b15b372d2853
Issue-ID: VFC-1431
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
|
|
* Update docs/submodules/ccsdk/platform/plugins.git from branch 'master'
to 6b5636fe2ddaab95d180876127701e71639faf78
- Update DMaaP plugin - DataRouter subscriber creation
- Add privileged subscriber flag.
- Add decompression flag.
Change-Id: Id3c2e7fb88d858f4a1ebe4e1ab86598c0f3f30a0
Issue-ID: DCAEGEN2-1581
Signed-off-by: JoeOLeary <joseph.o.leary@est.tech>
|
|
* Update docs/submodules/aai/aai-common.git from branch 'master'
to 2e2c16806c4effa2a0484fc9ab69ffea69bd9b84
- Enable deploy plugin
Issue-ID: AAI-2464
Change-Id: I541d3053ba7c40dcc6cdc0636230901f24f6b268
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
|
|
* Update docs/submodules/oom.git from branch 'master'
to df7fba01e18132103b9ddd6e4d64a4777323340d
- Removed duplicate OOM doc links
Issue-ID: OOM-1939
Signed-off-by: Mike Elliott <mike.elliott@amdocs.com>
Change-Id: I66406dc202155879106d22f63c0fefae7e8e52fe
|
|
* Update docs/submodules/integration.git from branch 'master'
to ba69f38745415ce3b3b5c3648f691a81c3b36124
- Correct use-case description
Minor editorial corrections
Issue-ID: INT-1104
Signed-off-by: Eric Debeau <eric.debeau@orange.com>
Change-Id: I1ed77383f9b35226c1b2c40b64b861bbb9be70a1
|
|
* Update docs/submodules/music.git from branch 'master'
to adc57bf3caf06cedce298ec62a6b6086f305c110
- Sonar Changes for Authentication Classes
Issue-ID: MUSIC-418
Signed-off-by: Nelson, Thomas (tn1381) <tn1381@att.com>
Change-Id: I42240c66179a8a7a1b27093d3fffc180a73f4d14
Signed-off-by: Nelson, Thomas (tn1381) <tn1381@att.com>
|
|
* Update docs/submodules/oom.git from branch 'master'
to 3befe3f9fe76963beb76b360dac9ea8743616a72
- Merge "Update robot image version"
- Update robot image version
Signed-off-by: Yang Xu <yang.xu@futurewei.com>
Issue-ID: INT-1122
Change-Id: I9c486ea3e10d15c193029b3903b3547732c917d1
|
|
* Update docs/submodules/integration.git from branch 'master'
to 587704d6838ce93b67491803c2b0e04e9fab0a78
- Update vCPE use case doc
Signed-off-by: Yang Xu <yang.xu@futurewei.com>
Issue-ID: INT-1104
Change-Id: I77f6a796dba7e6bfb155ccb1c82281ab31c17446
|
|
* Update docs/submodules/integration.git from branch 'master'
to 1b31a1d43b9be2938fde5639ab7aaea6262adc4f
- Clean up vCPE script
Signed-off-by: Yang Xu <yang.xu@futurewei.com>
Issue-ID: INT-847
Change-Id: I1158442cd73c6e0d943e9cc111cb12dae1381d36
|
|
* Update docs/submodules/aaf/authz.git from branch 'master'
to ba989d05eca8d2a98c51ed9d38c4c3345db23349
- Changes from Onsite Tests
Issue-ID: AAF-857
Change-Id: I3fbed32ff5b2bb8f05f4f932c8dc2f4012c8b429
Signed-off-by: Instrumental <jonathan.gathman@att.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to b41e27a42dfb9ea2bc9ea4d8c6d83de36f0d5064
- Merge "Merge remote-tracking branch 'origin/dublin' into 'origin/master'"
- Merge remote-tracking branch 'origin/dublin' into 'origin/master'
Change-Id: I2b91332563d9c7b0f469c9e45a35cc1376465c5e
Issue-ID: SO-2058
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
- Process workflow artifacts last
Workflow artifacts need to be processed last, check for existence of VNF resource
Issue-ID: SO-2045
Signed-off-by: Kuleshov, Elena <evn@att.com>
Change-Id: Ia46a6ecaef905287ce837c04b389ab2a13d3f24e
- update the SO release notes
Issue-ID: SO-2010
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
Change-Id: I7fc46c2dbdfc5ee7e79aca86f8148b9f43743d5c
- update SO release notes path for dublin
update SO release notes path for dublin
Change-Id: I2637374b813264a125049b0ab224bb5c84ebda8e
Issue-ID: SO-1992
Signed-off-by: sarada prasad sahoo <sarada.prasad.sahoo@huawei.com>
- VNFM adapter handle getOperation after VNF delete
Change-Id: Iaa8d792f5660b1caf16d081779c14799d827a544
Issue-ID: SO-2030
Signed-off-by: MichaelMorris <michael.morris@est.tech>
- Fixing NullPointerException thrown by EtsiVnfDeleteBB
Change-Id: I219989c25f05c94d01c7c697425da93997114216
Issue-ID: SO-2029
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
- Added known issue for VNFM adater testing
Change-Id: I257b485429cc91ac9c86682b385cd978b01b5cd2
Issue-ID: SO-1742
Signed-off-by: MichaelMorris <michael.morris@est.tech>
- update SO release notes for dublin
Change-Id: I57e96451b9d659a6d1f8cac3710b6daa520b9377
Issue-ID: SO-1992
Signed-off-by: sarada prasad sahoo <sarada.prasad.sahoo@huawei.com>
- Update version to 1.4.4
Update version to 1.4.4.
Issue-ID: SO-2010
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
Change-Id: Ice93606ea30d175c64b9511bcc24a294e3bd835e
- Merge "Fix handling of NULL WorkflowAction northboundRequest" into dublin
- Fix handling of NULL WorkflowAction northboundRequest
Issue-ID: SO-1995
Change-Id: I16fd6067d4fe31ce66b399e292a7e0706fe05c0c
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
- Beans fixes to workflow record creation
Changes to enable cascading creates and proper id referencing
Issue-ID: SO-1998
Signed-off-by: Kuleshov, Elena <evn@att.com>
Change-Id: I6c08fc22fbbba1d0d2b8dc04e390cd0b3de64327
|
|
* Update docs/submodules/so.git from branch 'master'
to 7cfae9f008deb9da1b7241fff48502bf86944341
- Merge "Security updates for maven dependencies"
- Security updates for maven dependencies
Update commons-collections version to 3.2.2.
Updated distribution client version to 1.4.0.
Update commons-fileupload to version 1.4.
Update commons-codec to version 1.12.
Change-Id: I4ab794e3aef7300c30088e5197092fd30231c4af
Issue-ID: SO-2043
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to 532a24c8c574d8a8b0041bfe7112264babd9e9fc
- Merge "Updated path to match AID for resume requests"
- Updated path to match AID for resume requests
Updated path to match AID for resume requests
Change-Id: I0035360f206882e602265500dcd54036b3e69ea2
Issue-ID: SO-2042
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to 1535fc611980495b8c3ac9810fd50008bc66afb7
- Merge "Moved code inside IF checking for null ptr to prevent crash"
- Moved code inside IF checking for null ptr to prevent crash
Issue-ID: SO-1841
Signed-off-by: Oleksandr Moliavko <o.moliavko@samsung.com>
Change-Id: Ie759b98828f39fba00ccdb7edcd7fc28e83ea50e
|
|
* Update docs/submodules/so.git from branch 'master'
to 4a236628def84575874810d61638aa640e51c804
- Merge "Sonar fixes in MsoVnfAdapterAsyncImpl"
- Sonar fixes in MsoVnfAdapterAsyncImpl
General fixes and improvements according to the Sonar analysis.
-Removed unnecessary code.
Issue-ID: SO-1220
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
Change-Id: I0f9ab1fe490975e4eefa31afd5bf09616f4de3f2
|
|
* Update docs/submodules/so.git from branch 'master'
to af1874da7e288ab64aac169421146e442293e26e
- Merge "Sonar fixes and improvements"
- Sonar fixes and improvements
General fixes and improvements according to the Sonar analysis.
-Fixed imports.
-Removed unnecessary code.
Issue-ID: SO-1992
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
Change-Id: I4299f3efc4444625f70fc36e65b57c500b113596
|
|
* Update docs/submodules/oom/offline-installer.git from branch 'master'
to 39b0b7cd88912410c15c5f4d705c52e81c69c703
- Merge "Streamline nexus role tests by using smaller test images"
- Streamline nexus role tests by using smaller test images
A 140mb haproxy image was substituted with tiny alpine
image to make CI tests faster.
Change-Id: Ic1a234df8f293e12a6e864817a19bf5445f10fe9
Issue-ID: OOM-1942
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
|
|
* Update docs/submodules/oom/offline-installer.git from branch 'master'
to 97a93cad5286e57921b5e635379cbb7f1d843d55
- Merge "Remove artifacts left by 'dns' role tests"
- Remove artifacts left by 'dns' role tests
'dnsmasq.tar' docker image file will be removed
after test invocation.
Change-Id: I29668ece8c745794ad9462e527ca144bea6f4fc2
Issue-ID: OOM-1943
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
|
|
* Update docs/submodules/oom/offline-installer.git from branch 'master'
to 9591bbf978d8e738143f4a94b6df7045e4074f78
- Merge changes from topic "bin_utils"
* changes:
Fix tests for binaries preparation in installation steps
Add binaries preparation to installation steps
- Fix tests for binaries preparation in installation steps
Change-Id: Ib28bda24b711111c13bbaf9bd2628abd2001a1a9
Issue-ID: OOM-1925
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
- Add binaries preparation to installation steps
Adding binaries preparation into installation steps as rke binary need
to be renamed and helm binary need to be unarchived. Removing those
previously manual steps from BuilGuide
Issue-ID: OOM-1925
Change-Id: I504320fb82e1c8f6db2f99c5dfd4518192eae895
Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com>
|
|
* Update docs/submodules/dmaap/datarouter.git from branch 'master'
to 56bef7eb388a5783ec27e7d641ea3e0f64e7abbd
- Merge "Logging improvements"
- Logging improvements
Change-Id: Ic0ad656b9bb041f65a37103680e3599c8ca1f98e
Issue-ID: DMAAP-1203
Signed-off-by: egernug <gerard.nugent@est.tech>
|
|
* Update docs/submodules/logging-analytics.git from branch 'master'
to 8699c6606de31c116cd45f2fc74f048a5e3f397c
- pylog is not compatible with python3
fix mdcContext bugs
Change-Id: I29117652382e15e5eec2cf0cb91c573beed4526e
Issue-ID: LOG-1072
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
|
|
* Update docs/submodules/usecase-ui.git from branch 'master'
to af979cd7eb90c47b8376c856ac221a8fb38489c3
- bug: fix some docs bugs
Change-Id: I8896a246bcd1d6c783220442ca9d26742b1d41ba
Issue-ID: USECASEUI-278
Signed-off-by: xuran <xuranyjy@chinamobile.com>
|
|
* Update docs/submodules/policy/parent.git from branch 'master'
to ba5f4d309fe94c7e98199276584b96fb1617706f
- Move docker documentation into installation
In the wrong spot.
Issue-ID: POLICY-1850
Change-Id: If421614ab94bd1f02fec241d3583034baf0e3fcb
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
|
|
* Update docs/submodules/multicloud/k8s.git from branch 'master'
to 8445148cf095fcc55a9ada3e2bb0fece7a065089
- Merge "Change the import paths for go get access"
- Change the import paths for go get access
This allows other projects to do a go get and use this repo.
go get github.com/multicloud-k8s/src/k8splugin
will do the job.
import github.com/multicloud-k8s/src/k8splugin
will import the root package
Issue-ID: MULTICLOUD-666
Change-Id: I2f41c88c5a7fb3305b78cce8a83a0e102baa444c
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
|
|
* Update docs/submodules/modeling/toscaparsers.git from branch 'master'
to 1d0484710e62a87d22eeb0a3fd039f8a589d7a83
- Add python tosca parser release note
Add python tosca parser release note
Change-Id: If8c6885156dd8a70afe242a4037e8bca6dcbab02
Issue-ID: MODELING-173
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
|
|
* Update docs/submodules/multicloud/k8s.git from branch 'master'
to 1b17eca7ab6c6fe1d14cc30c16354785b4ed6cb4
- Correct installer.sh to enable testing during deployment
Issue-ID: MULTICLOUD-686
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: I02724ca72a217cbb5be8cfee5edf136f4bf8ce2c
|