This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch 4.15
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from f8ad3ad cks: use HttpsURLConnection for checking api server (#4639)
add f893c5c cks: fix token TTL, set it to never expire (#4747)
add 6e7516c kvm: Fix get_bridge_physdev where it returns "device:"
instead of just "device" (#4740)
add 709ebf6 Merge remote-tracking branch 'origin/4.13' into 4.14
add 97c1b72 Merge remote-tracking branch 'origin/4.14' into 4.15
No new revisions were added by this update.
Summary of changes:
.../kubernetes-service/src/main/resources/conf/k8s-master.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)