diff options
author | 2021-05-20 15:43:35 +0100 | |
---|---|---|
committer | 2021-05-20 16:40:13 +0100 | |
commit | fa94a96fed5fd7af230a90373a04da47370e2eea (patch) | |
tree | 403698f7b95a884248c1414304e42d23e406d05e /src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson | |
parent | 65262f8dd9a6b9cbc284daa02ae332380e374483 (diff) |
Merge master into tosca-poc branch
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>
Diffstat (limited to 'src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson')
-rw-r--r-- | src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson b/src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson deleted file mode 100644 index 04caffa99..000000000 --- a/src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson +++ /dev/null @@ -1,23 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights - * reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - * =================================================================== - */ - -class=org.onap.policy.clamp.configuration.ClampGsonDataFormat
\ No newline at end of file |