aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/resources/clds/key.properties
AgeCommit message (Collapse)AuthorFilesLines
2021-05-20Merge master into tosca-poc branchliamfallon1-1/+0
This review was created with the commands: git co master git pull git co tosca-poc git pull git merge -X theirs master With this merge, the CLAMP master branch is merged into tosca-poc, and, apart from the tosca-controlloop directory, they are identical Issue-ID: POLICY-3215 Change-Id: Iaa1c4894b33508f8bb75b7d1c0dd414964497625 Signed-off-by: liamfallon <liam.fallon@est.tech>
2021-01-06Merge clamp master into tosca-poc branchliamfallon1-1/+1
This change mreges changes in clamp master into the tosca-poc branch because the two banches have diverged. Issue-ID: POLICY-2971 Change-Id: Iea4efe90204c98eeaae0b112ad5c964f722afdb0 Signed-off-by: liamfallon <liam.fallon@est.tech>
2017-11-16Rework CryptoUtilsDeterme, Sebastien (sd378r)1-0/+1
CryptoUtils now takes the key from a file located in the resource not in spring file Change-Id: I002978d292550e6173efb4324cbb977f35d7e753 Issue-ID: CLAMP-74 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>