diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2020-10-02 11:44:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-10-02 11:44:17 +0000 |
| commit | 3bbf75242f7c41a93b5e0b9c606e8c110c1e71bc (patch) | |
| tree | 55f9a7b9c664e85a1e43601102d2219958715966 /controlloop/common/feature-controlloop-management/src | |
| parent | 0c58bc4514f89c6f886d459f21256379b294567b (diff) | |
| parent | 7d00fbcf3d4536e310f689eb1c267ff6e210b2c1 (diff) | |
Merge "Remove cds actor timeout"
Diffstat (limited to 'controlloop/common/feature-controlloop-management/src')
| -rw-r--r-- | controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment index 78e74c6c2..9993e63a1 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment @@ -3,7 +3,7 @@ # ONAP # ================================================================================ # Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. -# Modifications Copyright (C) 2019 Bell Canada. +# Modifications Copyright (C) 2019-2020 Bell Canada. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -55,4 +55,6 @@ cds.grpcHost=${envd:CDS_GRPC_HOST} cds.grpcPort=${envd:CDS_GRPC_PORT} cds.grpcUsername=${envd:CDS_GRPC_USERNAME} cds.grpcPassword=${envd:CDS_GRPC_PASSWORD} +# The timeout defined in policy will take preference over the one below always. +# This timeout will be removed in Honolulu along with related code. cds.grpcTimeout=10 |