Kris McQueen 848ce60097 Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.		2010-09-28 15:47:14 -07:00
..
dao	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
security	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
BasicVirtualNetworkAllocator.java	Source code committed	2010-08-11 09:13:29 -07:00
ExteralIpAddressAllocator.java	Committing Kris' big merge	2010-08-11 16:02:57 -07:00
FirewallRuleVO.java	Source code committed	2010-08-11 09:13:29 -07:00
HAProxyConfigurator.java	Source code committed	2010-08-11 09:13:29 -07:00
IPAddressVO.java	Source code committed	2010-08-11 09:13:29 -07:00
IpAddrAllocator.java	Source code committed	2010-08-11 09:13:29 -07:00
LoadBalancerConfigurator.java	Source code committed	2010-08-11 09:13:29 -07:00
LoadBalancerVMMapVO.java	Source code committed	2010-08-11 09:13:29 -07:00
LoadBalancerVO.java	Source code committed	2010-08-11 09:13:29 -07:00
NetworkEnums.java	Source code committed	2010-08-11 09:13:29 -07:00
NetworkRuleConfigVO.java	Source code committed	2010-08-11 09:13:29 -07:00
SecurityGroupVMMapVO.java	Source code committed	2010-08-11 09:13:29 -07:00
SecurityGroupVO.java	changes	2010-08-18 12:19:22 -07:00
VirtualNetworkAllocator.java	Source code committed	2010-08-11 09:13:29 -07:00