etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server
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
..
conf debian: Package ulimits and sudo rules 2013-03-14 15:55:32 +01:00
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src Merge branch 'master' into cisco-vnmc-api-integration 2013-03-20 16:20:10 +05:30
test CLOUDSTACK-1218: Use the first IP in the first vlan range for VR in shared network 2013-03-14 13:13:31 -07:00
pom.xml ignore the tests looking for db 2013-03-01 12:04:06 +05:30