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 75030e5522ba5894b8528f809aa586d28b801f50 Merge: c8a980b 4f49bf6 Author: Rohit Yadav <rohit.ya...@shapeblue.com> AuthorDate: Wed Aug 1 16:37:21 2018 +0530 Merge branch '4.11' .../hypervisor/vmware/resource/VmwareResource.java | 19 +++++++++++-------- tools/appliance/builtin/template.json | 4 ++-- ui/scripts/instances.js | 1 + ui/scripts/templates.js | 4 ++++ 4 files changed, 18 insertions(+), 10 deletions(-)