Alena Prokharchyk ce876e24de VPC: intermidiate checkin to Static Routes ...

Conflicts:

	api/src/com/cloud/api/ApiConstants.java

2012-06-25 21:00:57 -07:00

..

bindir

Bug 9479 - provide option for built in https

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

distro

- support SLES and openSUSE as configuration and build targets

2012-05-27 19:31:27 -04:00

tomcatconf

VPC: intermidiate checkin to Static Routes

2012-06-25 21:00:57 -07:00

WEB-INF

CS-15202: Rename all references in UI of Nexus VSM/dvswitch to Nexus 1000v

2012-06-13 11:24:09 -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