This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch nsx-integration-fixes
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from fe7fcc2f14b fix merge conflict
add fe423939957 fix issue caused due to forward merge:
https://github.com/apache/cloudstack/commit/90fe1d5fdcc2909130b5de6803b57feeff194f54
No new revisions were added by this update.
Summary of changes:
.../src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
