Prachi Damle
|
df5c4c3048
|
Fixing VPC unit test to use Spring
|
2013-01-24 23:05:31 -08:00 |
|
Kelven Yang
|
6fb1a1e6f1
|
Fix issues after another round of merge
|
2013-01-11 16:54:32 -08:00 |
|
Alex Huang
|
56e5fbdee2
|
removed import of componentlocator and inject from all files
|
2013-01-10 11:44:47 -08:00 |
|
Alena Prokharchyk
|
214bbf3ebd
|
CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup
Conflicts:
api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
server/src/com/cloud/network/element/CiscoNexusVSMElement.java
server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
server/src/com/cloud/network/element/NetscalerElement.java
server/src/com/cloud/network/element/OvsElement.java
server/src/com/cloud/network/element/VpcJuniperSRXExternalFirewallElement.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
server/src/com/cloud/storage/StorageManager.java
|
2012-10-17 17:26:19 -07:00 |
|
Gavin Lee
|
d3921139ed
|
Patch from Gavin Lee: Change license to ASL2.0 in server and tools
Signed-off-by: Chip Childers <chip.childers@gmail.com>
|
2012-08-30 10:36:29 -04:00 |
|
Alena Prokharchyk
|
3cf13c8b7c
|
Fixed unittest
Conflicts:
server/test/com/cloud/vpc/VpcApiUnitTest.java
|
2012-08-08 19:00:08 -07:00 |
|
Alena Prokharchyk
|
bda1e2d08d
|
VPC: more unittests for VpcService
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
|
2012-08-07 11:37:36 -07:00 |
|
Alena Prokharchyk
|
d38e9eebed
|
VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
|
2012-08-07 11:25:02 -07:00 |
|
Alena Prokharchyk
|
cf64fda5d5
|
VPC: unittest preparation
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
|
2012-08-07 11:23:52 -07:00 |
|