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

..

bindir

Bug 9479 - provide option for built in https

2011-09-01 17:09:06 -07:00

distro

Fix typo in cloud-management script

2011-08-12 18:16:40 -07:00

tomcatconf

Merge branch 'networkasservice'

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

WEB-INF

bug 10330: finally merge Rommer's CLVM patch

2011-11-02 18:03:58 -07:00

.classpath

fixed all the broken thirdparty stuff

2011-01-31 10:51:01 -08:00

.project

change client/.project to client not vmopsClient

2011-09-22 13:37:12 -07:00