Merge "Remove cds actor timeout"
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 78e74c6..9993e63 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.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