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

..

src/com/cloud

Merge branch 'networkasservice'

2011-11-10 16:36:08 -08:00

.classpath

Use exports for jar dependecy

2011-02-01 11:10:37 -08:00

.project

Source code committed

2010-08-11 09:13:29 -07:00