Alena Prokharchyk e7a1862867 VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr ... Conflicts: api/src/com/cloud/api/BaseCmd.java api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java server/src/com/cloud/configuration/DefaultComponentLibrary.java server/src/com/cloud/ha/UserVmDomRInvestigator.java		2012-08-03 14:23:45 -07:00
..
conf	fixing line endings in server	2012-04-07 20:13:10 -04:00
scripts	Source code committed	2010-08-11 09:13:29 -07:00
src/com/cloud	VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr	2012-08-03 14:23:45 -07:00
test	Merge branch 'master' into vpc	2012-08-02 18:45:37 -07:00
.classpath	bug 6745: Using UUID instead of integers - for System VM s	2011-11-03 07:33:57 -07:00
.project	Fix corrupted eclipse project settings, schema fixes and updated template download url	2010-09-29 18:41:54 -07:00