Alena Prokharchyk
d51719ddc3
Fixed unittest
2012-07-17 15:50:56 -07:00
Alena Prokharchyk
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
David Nalley
e87558256c
Patch from Chip Childers
...
https://reviews.apache.org/r/5704/
License header updates for the server folder
2012-07-02 09:51:21 -04:00
Alena Prokharchyk
982562b9fb
VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip)
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-15 14:31:58 -07:00
Alena Prokharchyk
7e119e4c94
Fixed addDhcpEntry/userdata/password in VPC setup
2012-06-15 14:27:24 -07:00
Alena Prokharchyk
0a7faa9838
Support for adding private network
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-15 14:20:34 -07:00
Alena Prokharchyk
f28cefc4c3
Added support for network shutdown in VPC guest networks
2012-06-15 14:07:59 -07:00
Alena Prokharchyk
7092532ae8
CS-15220: fixed db upgrade for networks using external devices
...
Reviewed-by: Sheng Yang
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
Conflicts:
server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-05 15:10:49 -07:00
Alena Prokharchyk
d11dceaccc
CS-14904
...
Fixed the bug where vm_instance.ha_enabled wasn't updated during service offering upgrade
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2012-05-15 12:36:40 -07:00
frank
2f634c0913
Switch to Apache license
2012-04-03 04:50:05 -07:00
Alena Prokharchyk
f9b31e895a
Fixed unittest
2011-11-11 14:32:25 -08:00
Alex Huang
ddbcd01f56
fixed up unit test
2011-11-11 14:15:13 -08:00
Alex Huang
f6fcaa49ec
Merge complete except for virtualnetworkappliancemanager
2011-11-10 15:18:16 -08:00
alena
a32c4f1ec6
Fixed unit tests
2011-11-03 14:02:53 -07:00
frank
3947c9a126
Bug 11522 - New agent manager
...
Initailize SearchCriteria2 in order to replace search interface of DAO
2011-10-03 10:32:27 -07:00
alena
a1331d1cfc
Intermidiate checkin to Project feature:
...
1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project
2011-09-20 18:35:28 -07:00
Chiradeep Vittal
2fc782b8ba
Add basic Mocks for some managers
2011-09-12 18:20:22 -07:00
