etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/plugins/hypervisors/vmware/src/com/cloud
History
Koushik Das 0232048f90 Merge branch 'master' into cisco-vnmc-api-integration 
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	setup/db/db/schema-410to420.sql
	tools/marvin/marvin/integration/lib/base.py
 		2013-04-15 17:05:59 +05:30
..
api All merge conflicts resolved 2013-01-18 12:14:57 -08:00
ha Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
hypervisor Merge branch 'master' into cisco-vnmc-api-integration 2013-04-15 17:05:59 +05:30
network CLOUDSTACK-301 Nexus 1000v DVS integration is not functional 2013-04-02 11:59:02 +05:30
storage/resource QuickCloud: Enable secondary storage daemon to run outside the system vm 2013-04-09 14:45:25 -07:00