Sheng Yang bde1f6d2de Merge branch 'networkasservice' ... Conflicts: api/src/com/cloud/api/commands/CreateRedundantVirtualRouterElementCmd.java api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java server/src/com/cloud/api/ApiResponseHelper.java server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/src/com/cloud/offerings/NetworkOfferingVO.java setup/db/create-schema.sql		2011-11-10 16:36:08 -08:00
..
ConsoleProxy.java	Comment out code in executors during the transition to the new API framework. The code is being left around for reference during testing/debugging of the new framework and will be removed in the future.	2010-09-17 11:13:29 -07:00
ConsoleProxyVO.java	bug 9623: set ha_enable to false for consoleProxy vms and service_offering.	2011-04-29 11:53:07 -07:00
DomainRouterVO.java	NaaS: Merge Role.DHCP_USERDATA and Role.DHCP_FIREWALL_LB_USERDATA to Role.VIRTUAL_ROUTER	2011-11-09 17:09:17 -08:00
InstanceGroupVMMapVO.java	Added missing license info to the bunch of files	2010-09-27 19:08:03 -07:00
InstanceGroupVO.java	bug 6745: Using UUID instead of integers - for all commands	2011-11-03 07:34:00 -07:00
SecondaryStorageVm.java	bug 8713 : finalize the implementation of supporting system vm pooling	2011-03-31 17:14:09 -07:00
SecondaryStorageVmVO.java	bug 9623: set ha_enable to false for consoleProxy vms and service_offering.	2011-04-29 11:53:07 -07:00
SystemVm.java	started vms with these latest	2011-02-11 17:03:04 -08:00
UserVmDetailVO.java	Defined missing length field for VO classes	2011-08-17 15:13:28 -07:00
UserVmVO.java	bug 11360: make user_vm_details generic to all VMs instead of user-only VMs, VM details info will be carried down to hypervisor resource	2011-09-07 15:42:40 -07:00
VMInstanceVO.java	bug 6745: Using UUID instead of integers - for VM instances	2011-11-03 07:33:56 -07:00
VirtualDisk.java	Source code committed	2010-08-11 09:13:29 -07:00
VirtualEnvironment.java	Source code committed	2010-08-11 09:13:29 -07:00
VirtualMachineName.java	bug 9619: handle two types of domr name	2011-04-29 14:13:25 -07:00
VirtualNetwork.java	Changed networkconfigurations to network as per Sheng's suggestion	2010-11-19 15:44:42 -08:00
VmDetailConstants.java	bug 11362: Make VM network adapter device type be selectable based on VM-specific details	2011-09-07 17:58:42 -07:00