You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by ro...@apache.org on 2020/10/14 10:37:35 UTC

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.14'

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 d6db47618de46af2c0691410c7951e313b6e817c
Merge: 5b419b9 16bb053
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Oct 14 16:06:57 2020 +0530

    Merge remote-tracking branch 'origin/4.14'

 .../user/kubernetes/cluster/ScaleKubernetesClusterCmd.java       | 2 +-
 .../org/apache/cloudstack/metrics/PrometheusExporterImpl.java    | 9 ++++++---
 scripts/vm/network/vnet/modifyvxlan.sh                           | 3 +++
 3 files changed, 10 insertions(+), 4 deletions(-)