Updated Branches:
refs/heads/4.0 1ff798ca7 -> a43834674
CLOUDSTACK-191: Update checking for updateCustomerGateway
Reviewed-by: Anthony Xu
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/re
CLOUDSTACK-191: Update checking for updateCustomerGateway
Reviewed-by: Anthony Xu
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator
Updated Branches:
refs/heads/master 3a313ee1f -> a82ee7715
CLOUDSTACK-191: Update checking for updateCustomerGateway
Reviewed-by: Anthony Xu
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack