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-provider/src/main/resources | |
parent | e1184d3033ca9f1e1572050ef6f92f67a62865d0 (diff) | |
parent | f8ebec657389d40a88442b5a9be1a18254bbdbfd (diff) |
Merge "saltstack to take env and file param"
Diffstat (limited to 'saltstack-adapter/saltstack-adapter-provider/src/main/resources')
2 files changed, 5 insertions, 5 deletions
diff --git a/saltstack-adapter/saltstack-adapter-provider/src/main/resources/org/opendaylight/blueprint/saltstack-adapter-blueprint.xml b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/org/opendaylight/blueprint/saltstack-adapter-blueprint.xml index df5c46d3..2c3b7b04 100755 --- a/saltstack-adapter/saltstack-adapter-provider/src/main/resources/org/opendaylight/blueprint/saltstack-adapter-blueprint.xml +++ b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/org/opendaylight/blueprint/saltstack-adapter-blueprint.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= openECOMP : SDN-C ================================================================================ - Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights + Copyright (C) 2017 - 2018 Samsung Electronics. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/saltstack-adapter/saltstack-adapter-provider/src/main/resources/saltstack-adapter.properties b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/saltstack-adapter.properties index ccaea20c..0b077524 100644 --- a/saltstack-adapter/saltstack-adapter-provider/src/main/resources/saltstack-adapter.properties +++ b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/saltstack-adapter.properties @@ -1,10 +1,10 @@ ### # ============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. @@ -18,7 +18,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========================================================= ### |