diff options
| author |   Eddy Hautot <eh552t@intl.att.com> | 2018-04-24 22:38:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-24 22:38:06 +0000 |
| commit | 8c61814411a5390a946476dee876a320f3c5a4d7 (patch) | |
| tree | 6f782ca40b94b80d384091d1c5e9190b93ef68a0 /src/test/resources | |
| parent | e265dec047435408d2349e9f101349bcfbd3ef6c (diff) | |
| parent | b820858741ca015ffa67ff71ee9e1411437843ba (diff) | |
Merge changes Ib3c339b2,I47888da8,Ifdc5a4d9,I2f7b7417,If10e2dff, ...
* changes:
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Remove ECOMP in headers
Diffstat (limited to 'src/test/resources')
| -rw-r--r-- | src/test/resources/application.properties | 2 | ||||
| -rwxr-xr-x | src/test/resources/http-cache/start_http_cache.sh | 2 | ||||
| -rwxr-xr-x | src/test/resources/http-cache/third_party_proxy.py | 2 | ||||
| -rw-r--r-- | src/test/resources/https/https-test.properties | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 535f54af..fb11595a 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -18,7 +18,7 @@ # limitations under the License.
# ============LICENSE_END============================================
# ===================================================================
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
###
info.build.artifact=@project.artifactId@
diff --git a/src/test/resources/http-cache/start_http_cache.sh b/src/test/resources/http-cache/start_http_cache.sh index fb4975e5..a8ff96ac 100755 --- a/src/test/resources/http-cache/start_http_cache.sh +++ b/src/test/resources/http-cache/start_http_cache.sh @@ -19,7 +19,7 @@ # limitations under the License. # ============LICENSE_END============================================ # =================================================================== -# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ### echo "Starting HTTP CACHE python script" diff --git a/src/test/resources/http-cache/third_party_proxy.py b/src/test/resources/http-cache/third_party_proxy.py index 29d34cc8..fdc4fab3 100755 --- a/src/test/resources/http-cache/third_party_proxy.py +++ b/src/test/resources/http-cache/third_party_proxy.py @@ -19,7 +19,7 @@ # limitations under the License. # ============LICENSE_END============================================ # =================================================================== -# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ### import json diff --git a/src/test/resources/https/https-test.properties b/src/test/resources/https/https-test.properties index 4db8addf..c503b531 100644 --- a/src/test/resources/https/https-test.properties +++ b/src/test/resources/https/https-test.properties @@ -18,7 +18,7 @@ # limitations under the License. # ============LICENSE_END============================================ # =================================================================== -# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ### ### Set the port for HTTP or HTTPS protocol (Controlled by Spring framework, only one at a time). |