etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/core
History
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
test/com/cloud bug 10971: support vSphere 5 2011-09-26 12:16:28 -07:00
.classpath fixed eclipse classpath 2011-08-31 13:35:37 -07:00
.project revert un neccessary changes 2010-09-29 18:40:52 -07:00