diff options
| author |   Dan Timoney <dt5972@att.com> | 2018-07-19 16:16:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-07-19 16:16:22 +0000 |
| commit | 77ee1a55c18e1992bcf2b17b09bc874ab8bc8f6a (patch) | |
| tree | a3f67530462053efaaec095168254019089a1dfa /saltstack-adapter/saltstack-adapter-features | |
| parent | e1184d3033ca9f1e1572050ef6f92f67a62865d0 (diff) | |
| parent | f8ebec657389d40a88442b5a9be1a18254bbdbfd (diff) | |
Merge "saltstack to take env and file param"
Diffstat (limited to 'saltstack-adapter/saltstack-adapter-features')
3 files changed, 11 insertions, 12 deletions
diff --git a/saltstack-adapter/saltstack-adapter-features/.gitignore b/saltstack-adapter/saltstack-adapter-features/.gitignore index 8820cee5..e1ca0dee 100644 --- a/saltstack-adapter/saltstack-adapter-features/.gitignore +++ b/saltstack-adapter/saltstack-adapter-features/.gitignore @@ -1,7 +1,7 @@ # ============LICENSE_START========================================== -# ONAP : APPC +# ONAP : CCSDK # =================================================================== -# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2018 Samsung Electronics. All rights reserved. # =================================================================== # # Unless otherwise specified, all software contained herein is licensed @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# # ============LICENSE_END============================================ /target/ /target-ide/ diff --git a/saltstack-adapter/saltstack-adapter-features/pom.xml b/saltstack-adapter/saltstack-adapter-features/pom.xml index 3b94b2fd..6f765c8f 100644 --- a/saltstack-adapter/saltstack-adapter-features/pom.xml +++ b/saltstack-adapter/saltstack-adapter-features/pom.xml @@ -1,16 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= - ONAP : APPC ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. ================================================================================ - Copyright (C) 2017 Amdocs ============================================================================= + ONAP : CCSDK ================================================================================ + Copyright (C) 2018 Samsung Electronics. 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. ECOMP is - a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END========================================================= --> + language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml b/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml index 5359d808..6eef6d27 100644 --- a/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml +++ b/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= - ONAP : APPC + ONAP : CCSDK ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018 Samsung Electronics. All rights reserved. ================================================================================ - Copyright (C) 2017 Amdocs + ============================================================================= Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ See the License for the specific language governing permissions and limitations under the License. - ECOMP is a trademark and service mark of AT&T Intellectual Property. + ============LICENSE_END========================================================= --> |