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 a1acfd3bfa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
 		2012-07-13 13:52:58 -07:00
..
WEB-INF CS-15388: Fix labels 2012-07-06 10:27: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-07-13 13:52:58 -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