etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/client
History
Alena Prokharchyk 634cd78baa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript
 		2012-06-28 17:41:40 -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
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 Merge branch 'master' into vpc 2012-06-28 17:41:40 -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