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
..
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00
2011-11-08 19:11:36 -08:00
2011-08-23 19:52:19 -07:00
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00
2011-07-11 14:19:35 -07:00
2010-08-11 09:13:29 -07:00
2011-08-23 19:52:19 -07:00
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00