[cloudstack] branch master updated (c43c69a -> b940a89)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from c43c69a  Merge release branch 4.11 to master
     add 392f62d  consoleproxy: use consoleproxy.domain for non-ssl enable env (#2562)
     new b940a89  Merge branch '4.11'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 core/src/main/java/com/cloud/info/ConsoleProxyInfo.java              | 5 +++++
 .../main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java    | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
rohit@apache.org.

[cloudstack] 01/01: Merge branch '4.11'

[ro...@apache.org]

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 b940a892f76c32b761dc7a8eec0f9a3197c5ba30
Merge: c43c69a 392f62d
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Tue Apr 17 12:58:39 2018 +0530

    Merge branch '4.11'

 core/src/main/java/com/cloud/info/ConsoleProxyInfo.java              | 5 +++++
 .../main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java    | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
rohit@apache.org.