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 d64f787b6674cf72aa39a75a1ec7c49177f29909 Merge: 1960124 f88d606 Author: Rohit Yadav <[email protected]> AuthorDate: Thu Jul 26 13:03:46 2018 +0530 Merge branch '4.11' .../main/java/com/cloud/info/ConsoleProxyInfo.java | 48 +++++++++++----------- ui/scripts/ui-custom/zoneWizard.js | 4 +- 2 files changed, 28 insertions(+), 24 deletions(-)
