This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit b7f86a69aa53bde4c98995686aadbc0a1a67bf81
Merge: 45e77dd 97c1b72
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Thu Mar 4 15:03:06 2021 +0530
Merge remote-tracking branch 'origin/4.15'
.../kubernetes-service/src/main/resources/conf/k8s-master.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
