Chiradeep Vittal
|
cadca5fc0c
|
Merge branch 'master' into network-refactor-merge2
Conflicts:
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
server/src/com/cloud/acl/DomainChecker.java
server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
|
2013-01-16 19:17:14 -08:00 |
|
Chiradeep Vittal
|
3529c47248
|
Rationalize the interface by injecting ipDeployers. This is step 1 and includes 2 service providers - Remote AccessVPN and S2S VPN
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
|
2013-01-04 15:08:55 -08:00 |
Rohit Yadav
|
5e0501d116
|
api_refactor: refactor project apis
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
- Fix trailing whitespaces for all *.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
|
2012-12-03 22:10:32 -08:00 |
Sheng Yang
|
bda9d0a843
|
S2S VPN: Fix license headers
|
2012-08-14 09:53:39 -07:00 |
|
Sheng Yang
|
8d4079d477
|
CS-6840: Add hypervisor commands for site-to-site vpn
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
|
2012-07-02 16:28:44 -07:00 |
|
Sheng Yang
|
0ce1e78364
|
CS-6840: Add Site2SiteVpnServiceProvider
|
2012-07-02 16:27:09 -07:00 |