Age | Commit message (Collapse) | Author | Files | Lines |
|
* Update docs/submodules/policy/engine.git from branch 'master'
to 349714f2b187d55560fd8ed9a461f64cac233743
- JUnit additions for PAP-REST, checkstyle fixes
Issue-ID: POLICY-2130
Change-Id: Ia9fb294090a27ee86321249bc6b1cbdf20f33d06
Signed-off-by: bobbymander <bobby.mander@att.com>
|
|
* Update docs/submodules/vid.git from branch 'master'
to 4c288cdd3d1393a18e8ef8d96f73f66e5996b54c
- rename class to JaxRsMetricLogClientFilter
Issue-ID: VID-253
Change-Id: I47727690015ab0183ba25a57b19fb280231c6fb3
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
|
|
* Update docs/submodules/vid.git from branch 'master'
to 5417f56b89f4780b3c43e5430aa38cc1035a2f1c
- register SyncRestClient to work with new MetricLogClient Filter
Issue-ID: VID-253
add API test that checks request headers logged tometrics log
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: Ic2bfb99d40482b939ddaa4ba5c694f1042c3dd69
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
|
|
* Update docs/submodules/vid.git from branch 'master'
to 94b51c73b499978aaddbb115de2b0f16f2d4db96
- assert that InvocationId is unique in API tests
Issue-ID: VID-253
Change-Id: I8bb4c752a9609d5b5a4c649befb7344a800b00b5
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
|
|
* Update docs/submodules/vid.git from branch 'master'
to 2faaef3c1c05fcef0cbcda7f77f6c173826e57b6
- assert headers in AAI base preset
Issue-ID: VID-253
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: Ic86ed177602f997f5040351f4a4fb3c79ed545a2
|
|
* Update docs/submodules/sdc.git from branch 'master'
to 781c7486078cbc6d9f8d7c9763c3d7592e8b089b
- Fix for missing import merge issue
Some imports from SDC-1952 were lost during the merge of SDC-1401,
they were re-added.
Change-Id: Ie3af8290f98afe4fd9278c218a47376abcdd1a3c
Issue-ID: SDC-1952, SDC-1401
Signed-off-by: andre.schmid <andre.schmid@est.tech>
|
|
* Update docs/submodules/modeling/etsicatalog.git from branch 'master'
to 0b6a49e188b44602ca83a5802b6820b32d3e2a35
- Get original vendor package under the ONBOARDING_PACKAGE directory from SDC resource CSAR
Change-Id: I50b346f6f709140363fc86684b1142fb28344a72
Signed-off-by: dyh <dengyuanhong@chinamobile.com>
Issue-ID: MODELING-265
|
|
* Update docs/submodules/vid.git from branch 'master'
to ccc560d4e557df5a8df1748c87820b5eebc4a262
- Merge "add to AAI headers in request and metric log"
- add to AAI headers in request and metric log
Issue-ID: VID-253
Including API test + use VidMetricLogClientFilter
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Change-Id: I62980b3c88e941d1a47b03c75a1c837078e1988b
|
|
* Update docs/submodules/multicloud/k8s.git from branch 'master'
to 599d59f739ce9af07360e0c45a7e12bee31fe650
- Merge "Testcases shouldn't run prematurely from installer script"
- Testcases shouldn't run prematurely from installer script
Testing_enabled: true in the installer script, causes
the test cases to run immediately after the playbook even before
the pods are completely up. Causing some of the test cases to fail.
Making sure, the test cases run only after all of playbooks
have finished running. Correcting the identation
Signed-off-by: Akhila Kishore <akhila.kishore@intel.com>
Issue-ID: MULTICLOUD-904
Change-Id: Ieec33f46301d7c8d9cb36ac5f32caefca2981804
|
|
* Update docs/submodules/aai/aai-common.git from branch 'master'
to 8701a61a2d4b6ae7a06b46aa49b2b0ed11b4853a
- Update to 5.0.2 in release notes
Issue-ID: AAI-2693
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: I53fce917c8b408ea852b933cae2c5db9f27003c6
|
|
* Update docs/submodules/integration.git from branch 'master'
to 26fc5ccfd75501997f53464461d21354d7860e6d
- Frankfurt Staging override
Add script to automatically generate the file as a test
Issue-ID: INT-1217
Change-Id: I9e1dc9b4b2d409ce162e098c90786e3ddce72146
Signed-off-by: Brian Freeman <bf1936@att.com>
|
|
* Update docs/submodules/multicloud/k8s.git from branch 'master'
to 703f8fb06d8c378beba5069017a8f301345034d0
- Bug fixes to containerized installer script
Issue-ID: MULTICLOUD-905
Co-authored-by: Itohan Ukponmwan <itohan.ukponmwan@intel.com>
Signed-off-by: Kuralamudhan Ramakrishnan <kuralamudhan.ramakrishnan@intel.com>
Change-Id: Ie9710146d4764f6b1f8ce11af9b28988131d75c8
|
|
* Update docs/submodules/ccsdk/cds.git from branch 'master'
to e2619d958f8237f00467da8cacb0fb9fd210a323
- Merge "Loopback code for GRPC functionality"
- Loopback code for GRPC functionality
GRPC integration for Draft, Publish, Download
Change-Id: I24e138fae766da7a112ac9f49a8ba036d81b5bb5
Issue-ID: CCSDK-1785
Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>
|
|
* Update docs/submodules/ccsdk/cds.git from branch 'master'
to d15ca6469a83d37f1b71962cf32d1a5b74e7fe97
- Merge "Modified vf-module-name"
- Modified vf-module-name
Issue-ID: CCSDK-1816
Signed-off-by: hanybaki <habdelbaki.ext@orange.com>
Change-Id: Iee947751589ef640a8c519d5ffabe424835bac93
Signed-off-by: Shaaban Ebrahim <shaaban.eltanany.ext@orange.com>
Signed-off-by: root <root@olc-rancher.novalocal>
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
|
|
* Update docs/submodules/ccsdk/cds.git from branch 'master'
to 2703d7ab7045089a381416d6e3b15df5f7e785ef
- Removed all http_proxy reference from build.
http_proxy is an environment configuration and should not be defined in
in the build script.
If you need to use a proxy to build docker images then add it to
the mvn command like this :
-Ddocker.buildArg.http_proxy=$PROXY -Ddocker.buildArg.https_proxy=$PROXY
Also adding http_proxy in the Dockerfile directly will add the
environment variable in the POD statically using the proxy the was
built with at runtime.
If a proxy is needed at runtime then the environment variables should be
injecting using helm charts and overrides.
Issue-ID: CCSDK-1877
Signed-off-by: Sebastien Premont-Tendland <sebastien.premont@bell.ca>
Change-Id: I2b99b277b594408c974cf29a5804384293776a22
|
|
* Update docs/submodules/logging-analytics.git from branch 'master'
to a4e98021b301f4146fd45e7089d8749f3b8448b9
- update getBasicAuthUserName
prevent excess error throwing in getBasicAuthUserName
Issue-ID: LOG-1184
Signed-off-by: Smokowski, Kevin (ks6305) <kevin.smokowski@att.com>
Change-Id: I226185ef19525095dbb9e5f480e43bd7b087bf8f
|
|
* Update docs/submodules/vid.git from branch 'master'
to 4c2176675390925c1a6b576ad62541106682c951
- Merge "Instantiation-Status: default on unexpected/undefined statuses (fix)"
- Instantiation-Status: default on unexpected/undefined statuses (fix)
Issue-ID: VID-692
Change-Id: I15c81daba1a45ff0e009d5e381f93adb03914c0f
Signed-off-by: Ittay Stern <ittay.stern@att.com>
|
|
* Update docs/submodules/oom.git from branch 'master'
to 83d278baef5b1de142c29935438bac38372fc888
- Merge "[NBI] Use mariadb-galera from common"
- [NBI] Use mariadb-galera from common
Instead of using "homegrown" mariadb chart, move to use the common
mariadb-galera chart in order to be aligned with most of the other users
of mariadb and eventually to move into the common mariadb galera
instance.
Change-Id: I0c8ed6adfea0d64f97e7d9378464039915d389c7
Issue-ID: EXTAPI-347
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
|
|
* Update docs/submodules/oom.git from branch 'master'
to 7102af90c8c37f8c9c196d79920453fdc6db2da1
- Merge "[Music] Adjust Pods Requests/Limits"
- [Music] Adjust Pods Requests/Limits
I've adjusted the Requests / Limits of portal pods according to real
usage of "Orange Openlab" and "Onap daily master".
Calculation is the following:
per deployment:
* CPU/Mem requests is max of average from the two deployments
* CPU/Mem limits is (max of max from the two deployments) * 1.2
Change-Id: I3fce54e6be495a7014bf346d66721976fa2dab8b
Issue-ID: MUSIC-533
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
|
|
* Update docs/submodules/vid.git from branch 'master'
to c638391d22999bd61243794a1981d7476bfdbd5f
- use onap logging 1.6.1 with needed workarounds
Issue-ID: VID-253
Onap logging 1.6.1 has some mismatches regards invocationId.
This commit fix these mismatches by fixing the MDC when needed.
Change-Id: Ic8d35318ae511667dfa6f9c4297d562fd976a717
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 519c758ae5e18310ef8e5b20c4d13f04bfa8d8f9
- Update INFO.yaml
remove committers with no activity referenced in the repository since 1 year
https://git.onap.org/integration/stats/?period=q&ofs=-1
Issue-ID: INT-1349
Change-Id: I71f309432c47e6d5c89a471edcf593032e45cea8
Signed-off-by: mrichomme <morgan.richomme@orange.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 68d93c2a8cf5417cca2d4f9dafb30f08451ed24f
- Fix failures return codes in vcpe scripts
Conditional exits on failures should return
with non zero exit code for better behavior
in testing pipelines.
Change-Id: Ied2e699a2cd38cc741e6d9d9a5c88082f09fa549
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Issue-ID: TEST-226
|
|
* Update docs/submodules/sdc.git from branch 'master'
to 4e20fd14c1d71466fd5cedd8f633a2f317aa4691
- DmaapPublisher files update
Change-Id: I72b501587ed0b4ea8f7ba54614361d546b255cf6
Issue-ID: SDC-2560
Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
|
|
* Update docs/submodules/sdc.git from branch 'master'
to bf5eeb23a769a2e2b75f432b74f10fdbcfd2f161
- Fix zip slip security flaw
Apply zip slip checking in zip operations throughout the system.
Centralizes most of the zip logic in one class. Create tests to zip
functionalities and zip slip problem.
Change-Id: I721f3d44b34fe6d242c9537f5a515ce1bb534c9a
Issue-ID: SDC-1401
Signed-off-by: andre.schmid <andre.schmid@est.tech>
|
|
* Update docs/submodules/sdc.git from branch 'master'
to 19773b769c6762a12876064c70a34cc31d2b12da
- Validate SOL004 manifest signature order
SOL004 Manifest signature must be the last entry of the manifest.
Change-Id: Ie3835f7140ccdf92ef5518ca2d7571930de81971
Issue-ID: SDC-2587
Signed-off-by: andre.schmid <andre.schmid@est.tech>
|
|
* Update docs/submodules/sdc.git from branch 'master'
to 8ff60789e080dd99c604d31a6e754be164fba11e
- add artifacts support in TOSCA exported yml file
Change-Id: I56f8a6a1ce758876e83a7ee8318b79644ae7d5cb
Issue-ID: SDC-1952
Signed-off-by: Liang Ding <liang.ding@intel.com>
|
|
* Update docs/submodules/dmaap/messagerouter/messageservice.git from branch 'master'
to 39e89fa30757dfad93cb6fdae9e4770f2f5a0752
- remove the ip address in the example
Issue-ID: DMAAP-105
Change-Id: I7a9199d4468200f23836a672238f051fc4aedfd0
Signed-off-by: su622b <su622b@att.com>
|
|
* Update docs/submodules/oom.git from branch 'master'
to 5459713dc2d29f399ceb274390161d4b95011c7b
- Merge "bump the SO version to 1.5.3"
- bump the SO version to 1.5.3
Issue-ID: SO-2328
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
Change-Id: I694a53807d071e3ff14c4f013ec43a33af95f2ec
|
|
* Update docs/submodules/aai/sparky-be.git from branch 'master'
to 8cd11f35299fbe2b31b46fab1d48e2872f094a09
- [AAI-2180] Change aai sparky container processes to run as non-root on the host
Issue-ID: AAI-2180
Change-Id: I3a714101ab782b4c699cccff90dd4ac704eb4213
Signed-off-by: rajeevme<rajeev.mehta@amdocs.com>
Change-Id: I3b34861139db4763da5fe17fb116adddf523b69a
|
|
* Update docs/submodules/vid.git from branch 'master'
to a8ebb74702f07acead84edcdaf083d78a84d00a3
- Instantiation-Status: default on unexpected statuses
Issue-ID: VID-692
Change-Id: I1a81a71d32aa36fb1f0dc3b349733db11d4e579d
Signed-off-by: Ittay Stern <ittay.stern@att.com>
|
|
* Update docs/submodules/vid.git from branch 'master'
to bf74c24500acf037e24ff75008bbda83fe1be72b
- Test aai_get_service_instance_topology with vf-module placement data
Issue-ID: VID-603
Change-Id: I2ce89cac91417ef4b60a3943da80f0ff03f865ad
Signed-off-by: Ittay Stern <ittay.stern@att.com>
|
|
* Update docs/submodules/policy/engine.git from branch 'master'
to c46961c5322b8113dcf859e07e596bd7e473bc5d
- Fix knock on tabs/SONAR/Checkstyle issues
Changes in the last ONAP-REST review caused knock on changes in
ONAP-PDP-REST. Those changes identified issues in two classes with tabs.
While changing the tabs to spaces, some other easy to fix
SONAR/Checkstyle issues were addressed.
Issue-ID: POLICY-2132
Change-Id: I4e32089ada7b5095da0751993458cf7173cef064
Signed-off-by: liamfallon <liam.fallon@est.tech>
|
|
* Update docs/submodules/multicloud/k8s.git from branch 'master'
to b0e4204b131d51eb8d0d424ab9d74902f99b3a6f
- Provide gcc on installer host when not present
Issue-ID: MULTICLOUD-900
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: Ibacec8deafa5f1fd9ded5822236db730fedddc82
|
|
* Update docs/submodules/oom.git from branch 'master'
to b6ebe18c6bab9c30311400a16aae99c259a4f0f9
- Merge "Updated The Version of Holmes"
- Updated The Version of Holmes
Change-Id: I0f93684d1af27665e5a3fedc48ac2ca1648f4bfe
Issue-ID: HOLMES-268
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
|
|
* Update docs/submodules/oom.git from branch 'master'
to e3806913b0551c6bc5d5d66538f6bb59cd33fd2a
- Merge "AAF cert dist for DMaaP DR"
- AAF cert dist for DMaaP DR
Change-Id: I0bca8c7a16f8b19a266d9961715b8a04971d7b73
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: DMAAP-1269
|
|
* Update docs/submodules/oom.git from branch 'master'
to 8766da998da3ddcdeec17abd91ca2c17685c4ea8
- Merge "Add policy update notification topic to OOM"
- Add policy update notification topic to OOM
Issue-ID: POLICY-1841
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I2ab0b7f40a9b60531dccd6175c76d0a18726816e
|
|
* Update docs/submodules/oom.git from branch 'master'
to 2edc638d7350677bd163ffbb468b575fee1dc07c
- Merge "Enabled HTTPS for sdc-workflow-designer"
- Enabled HTTPS for sdc-workflow-designer
-Enabled HTTPS for frontend and backend
-Updated paths and passwords for a certificates
Issue-ID: SDC-2479
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: Ic4b379bc2eb73a984221fa06ddc0fe8f0fa2116b
|
|
* Update docs/submodules/oom.git from branch 'master'
to 67970a7f24418383af8c408c1126e3f0125b7ae0
- Merge "Move AWX postgres and Netbox posgtres PVC to RWO"
- Move AWX postgres and Netbox posgtres PVC to RWO
postgres doesn't support that many posgtres instances write into the
same folder so moving to RWO mode is harmless
Change-Id: I3faf715606a7bb479917faf022efbf6635d602f8
Issue-ID: OOM-2080
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
|
|
* Update docs/submodules/oom.git from branch 'master'
to 07409a84337e01aad192560ff02d8ffb2a8c7d95
- Merge "Remove unused PVC from mariadb-galera chart"
- Remove unused PVC from mariadb-galera chart
Used PVC(s) are actually created in the statefulset
Change-Id: I24f2c3ff0934178c9af06bfee60b4b6e35cfe953
Issue-ID: OOM-2155
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
|
|
* Update docs/submodules/oom.git from branch 'master'
to 475857ccfe9bd9fe06bb3c61bbb58190f1222945
- Fixing missing apiVersion in etcd chart
Missing apiVersion causes linting failure and therefore make common
fails
Issue-ID: OOM-2156
Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com>
Change-Id: Idb0aeb998fc99cc8e409247c6b5e20d140297a3e
|
|
* Update docs/submodules/vid.git from branch 'master'
to 8cb79d98ec8c9f2b2ec495eca11ca067dbc06acb
- Merge "Introduce cy.clearSessionStorage"
- Introduce cy.clearSessionStorage
Issue-ID: VID-647
Change-Id: I51471f736577599c1ace8e330a4db089deccc8ca
Signed-off-by: Ittay Stern <ittay.stern@att.com>
|
|
* Update docs/submodules/vid.git from branch 'master'
to b0a5365842404f32667ba6cbda12853323624eaf
- Cypress>=3.3.1 readFile() does not expect a relative file-path starting with /
See:
https://github.com/cypress-io/cypress/issues/4352#issuecomment-507963062
Issue-ID: VID-687
Change-Id: I5f5f34be85ec2d3401cdf01f4259c2b5d02da37c
Signed-off-by: Ittay Stern <ittay.stern@att.com>
|
|
* Update docs/submodules/portal.git from branch 'master'
to df4d078a7e3bcb1d566b0f3f69108979ecaf62d0
- Merge "Fix sonar issues"
- Fix sonar issues
Either log or rethrow this exception
Change this "try" to a try-with-resources
Move string literal on the left side of this string comparison
Issue-ID: PORTAL-562
Change-Id: I8966c035bb8c36026172457231f426179bb3ed48
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
|
|
* Update docs/submodules/portal.git from branch 'master'
to 224909a83ab3ae70596e8aaa4a89097576ff4b2c
- Security Vulnerability in pom.xml fix
com.att.eelf:eelf-core@1.0.0 -> 1.0.1-oss
org.hibernate:hibernate-validator@5.1.3.Final -> 6.0.17.Final
org.apache.cxf:cxf-rt-rs-client@3.0.0-milestone1 -> 3.3.3
com.fasterxml.jackson.core:jackson-databind@2.8.10 -> 2.8.11.4
org.elasticsearch:elasticsearch@2.2.0 -> 7.4.1
org.apache.tomcat:tomcat-websocket@8.0.28 -> 9.0.27
org.apache.poi:poi@3.15 -> 4.1.1
org.apache.poi:poi-scratchpad@3.5-FINAL -> 4.1.1
org.quartz-scheduler:quartz@2.2.1 -> 2.3.1
org.bouncycastle:bcprov-jdk15on@1.59 -> 1.64
commons-beanutils:commons-beanutils@1.9.3 -> 1.9.4
com.orbitz.consul:consul-client@0.13.8 -> 1.3.9
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider@2.8.10 -> 2.10.0
org.glassfish:javax.el@2.2.6 -> 3.0.0
javax.el:javax.el-api@2.2.1.b04 -> 3.0.0
org.glassfish.jersey.connectors:jersey-jetty-connector@2.23.1 -> 2.29.1
org.owasp.esapi:esapi@2.1.0.1 -> 2.2.0.0
com.thoughtworks.xstream:xstream@1.4.10 -> 1.4.11.1
com.alibaba:fastjson@1.2.7 -> 1.2.62
Issue-ID: PORTAL-439
Change-Id: Iad0c81e47386dfbc675470cc786c764ff93998a7
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
|
|
* Update docs/submodules/portal.git from branch 'master'
to 2bd26995f7ac5a0c1f19c1ca0ab1f5f0b50ea5c2
- Persistent XSS vulnerability in saveNewUser form fix
javax.validation.Validator used to fix this vulnerability issue.
Issue-ID: OJSI-16
Change-Id: I50a7acc4f7e9294170628fd5b2894ee6cbdba8f0
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
|
|
* Update docs/submodules/portal.git from branch 'master'
to 31643c4db220bda9ffd9ac06d884f9035bbc4e1f
- Persistent XSS vulnerability in microservices form
javax.validation.Validator used to fix this vulnerability issue.
Issue-ID: OJSI-19
Change-Id: I6993ca2ef750924a826f86de991ae0d2b47c3b57
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
|
|
* Update docs/submodules/portal.git from branch 'master'
to 85b0d73e7150af1cbebefa8e6f0ab4b5c96e6019
- Persistent XSS vulnerability in onboardingApps form fix
javax.validation.Validator used to fix this vulnerability issue.
Issue-ID: OJSI-18
Change-Id: I26ec795a23869c0dccd22c50e4469ae264cb7547
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
|
|
* Update docs/submodules/portal.git from branch 'master'
to bb6fb4c52904d119ba790d5d9c1f752649a74a0a
- Persistent XSS vulnerability in functionalMenuItem form fix
javax.validation.Validator used to fix this vulnerability issue.
Issue-ID: OJSI-21
Change-Id: Ie13e17edb4c12c9d60baca7fc85cc46d4480b84b
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
|
|
* Update docs/submodules/portal.git from branch 'master'
to 604bf4f45cf1f1726f1b8129963627ffb90b5f4c
- Persistent XSS vulnerability in basicAuthAccount form fix
javax.validation.Validator used to fix this vulnerability issue.
Issue-ID: OJSI-20
Change-Id: I2e8188d9dabf634fcaf41b8d42d0f7160cc0886d
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
|
|
* Update docs/submodules/sdc.git from branch 'master'
to c42c9f75adb72f80e57694b5bf67db7c94f33a89
- Fix for status properties value.
These changes were made to align the normative types to the TOSCA property definition requirements.
Issue-ID: SDC-322
Change-Id: I32e815dd26990dd6c82c859ad051b271db3c8029
Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
|