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 a1be9b02a6cc2b629a29b6cd6a712e9254f4eaa0 Merge: 81dfcbb 3a82392 Author: Rohit Yadav <[email protected]> AuthorDate: Sat Mar 6 16:02:09 2021 +0530 Merge remote-tracking branch 'origin/4.15' .../consoleproxy/ConsoleProxyResource.java | 10 ++++---- .../cloudstack/api/response/ProjectResponse.java | 8 ------- .../StartConsoleProxyAgentHttpHandlerCommand.java | 10 ++++++++ server/src/main/java/com/cloud/api/ApiServlet.java | 2 +- .../java/com/cloud/consoleproxy/AgentHookBase.java | 1 + .../cloud/consoleproxy/ConsoleProxyManager.java | 3 +++ .../consoleproxy/ConsoleProxyManagerImpl.java | 2 +- .../com/cloud/servlet/ConsoleProxyClientParam.java | 10 ++++++++ .../com/cloud/servlet/ConsoleProxyServlet.java | 15 ++++++++++-- .../com/cloud/template/TemplateAdapterBase.java | 8 +++++++ .../java/com/cloud/consoleproxy/ConsoleProxy.java | 26 +++++++++++++++++---- .../consoleproxy/ConsoleProxyClientParam.java | 10 ++++++++ .../ConsoleProxyHttpHandlerHelper.java | 2 ++ .../consoleproxy/ConsoleProxyNoVNCHandler.java | 27 ++++++++++++++++++++-- .../consoleproxy/ConsoleProxyNoVncClient.java | 4 ++++ .../resource/NfsSecondaryStorageResource.java | 6 +++++ ui/src/config/section/network.js | 2 +- ui/src/core/lazy_lib/components_use.js | 4 +++- ui/src/views/network/LoadBalancing.vue | 4 ++++ ui/src/views/network/PortForwarding.vue | 9 +++++++- ui/src/views/network/VpcTiersTab.vue | 3 +++ 21 files changed, 141 insertions(+), 25 deletions(-)
