etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server
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
..
conf fixing line endings in server 2012-04-07 20:13:10 -04:00
scripts
…
src/com/cloud Merge branch 'master' into vpc 2012-07-13 13:52:58 -07:00
test Merge branch 'master' into vpc 2012-07-13 13:52:58 -07:00
.classpath bug 6745: Using UUID instead of integers - for System VM s 2011-11-03 07:33:57 -07:00
.project
…