diff options
| author |   James Forsyth <jf2512@att.com> | 2018-03-22 12:16:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-22 12:16:39 +0000 |
| commit | b1264ad4012f67664d71982a0eaad7e9bcce34f4 (patch) | |
| tree | 037b5cd263fb905ee592f8b83c99f24cecb7eebe /aai-client-loadbalancer/src/main | |
| parent | b525e71480278b3314d0dde2e36ab494947cd0f7 (diff) | |
| parent | a9275b0c30881dac42f364ffca6f0d9cbff1b614 (diff) | |
Merge "Update the license for 2017-2018 license"
Diffstat (limited to 'aai-client-loadbalancer/src/main')
3 files changed, 3 insertions, 9 deletions
diff --git a/aai-client-loadbalancer/src/main/java/org/onap/aai/AAIRibbonConfiguration.java b/aai-client-loadbalancer/src/main/java/org/onap/aai/AAIRibbonConfiguration.java index 4c639e44..601c8734 100644 --- a/aai-client-loadbalancer/src/main/java/org/onap/aai/AAIRibbonConfiguration.java +++ b/aai-client-loadbalancer/src/main/java/org/onap/aai/AAIRibbonConfiguration.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 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. @@ -16,8 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.aai; diff --git a/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPing.java b/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPing.java index 4ecbfb60..fcda0747 100644 --- a/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPing.java +++ b/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPing.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 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. @@ -16,8 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.aai.config; diff --git a/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPingImpl.java b/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPingImpl.java index 2e5804eb..dd198016 100644 --- a/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPingImpl.java +++ b/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPingImpl.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 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. @@ -16,8 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.aai.config; |