Chip Childers
|
3a882fa17c
|
License header updates for the plugins folder.
|
2012-08-03 09:07:43 -04:00 |
|
kishan
|
9611a017e9
|
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
|
2012-07-27 23:37:46 -04:00 |
|
Alena Prokharchyk
|
a39fd61249
|
Merge branch 'master' into vpc
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineGuru.java
|
2012-07-27 13:47:46 -07:00 |
|
kishan
|
468f2720eb
|
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
|
2012-07-27 23:13:18 +05:30 |
|
Alena Prokharchyk
|
a1acfd3bfa
|
Merge branch 'master' into vpc
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/network/Network.java
client/tomcatconf/components.xml.in
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/guru/GuestNetworkGuru.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
setup/db/create-schema.sql
|
2012-07-13 13:52:58 -07:00 |
|
Edison Su
|
8b7b838c8a
|
CS-15544: recreate router if router filesystem is crashed
|
2012-07-11 16:14:28 -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 |
|
Murali reddy
|
9876d34ea4
|
moving out ELB network element to plugins/network-elements/elastic-loadbalancer
|
2012-07-02 15:05:58 -07:00 |
|