Kelven Yang
|
296c20332d
|
Merge javelin into master
|
2013-02-01 14:40:45 -08:00 |
|
Likitha Shetty
|
13ee8d1865
|
Persistent Networks support
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
|
2013-02-01 15:10:06 +05:30 |
|
Prachi Damle
|
df5c4c3048
|
Fixing VPC unit test to use Spring
|
2013-01-24 23:05:31 -08: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
|
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 |
|