etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/client
History
Koushik Das f0c1af2b5c Merge branch 'master' into cisco-vnmc-api-integration 
Conflicts:
	api/src/com/cloud/network/Network.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	client/tomcatconf/components-nonoss.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	setup/db/db/schema-410to420.sql
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
 		2013-03-20 16:20:10 +05:30
..
WEB-INF List view: Subselect UI: Fixes 2013-03-13 11:05:50 -07:00
bindir Summary: update packaging 2013-02-05 10:47:42 +01:00
distro init: Explicitly set the HOME variable to the homedir of the user cloud 2013-01-09 13:11:21 +01:00
tomcatconf Merge branch 'master' into cisco-vnmc-api-integration 2013-03-20 16:20:10 +05:30
pom.xml Merge branch 'master' into cisco-vnmc-api-integration 2013-03-20 16:20:10 +05:30