[cloudstack] branch master updated (7ee751e -> 68fcef3)

[ra...@apache.org]

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

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


    from 7ee751e  Merge pull request #1894 from Accelerite/CLOUDSTACK-9700
     add 5d989f3  CLOUDSTACK-9162: Handled vpn user add when vpn is not enabled on the account
     new 68fcef3  Merge pull request #2113 from Accelerite/vpnuser

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:
 .../org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java  | 2 +-
 server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java   | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].

[cloudstack] 01/01: Merge pull request #2113 from Accelerite/vpnuser

[ra...@apache.org]

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

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

commit 68fcef378361704d2fa54e5497f32512eb61ef99
Merge: 7ee751e 5d989f3
Author: Rajani Karuturi <ka...@users.noreply.github.com>
AuthorDate: Tue Jun 6 15:44:31 2017 +0530

    Merge pull request #2113 from Accelerite/vpnuser
    
     CLOUDSTACK-9162: Handled vpn user add when vpn is not enabled on the…

 .../org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java  | 2 +-
 server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java   | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.