etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/plugins
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
..
deployment-planners Moved out user concentrated pod deployment planner to plugins/deployment-planners/user-concentrated-pod 2012-06-25 17:58:45 -07:00
file-systems/netapp Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed 2012-07-06 11:43:31 -07:00
host-allocators/random moving out random host allocator to plugins/host-allocators/random/ 2012-06-25 18:47:47 -07:00
hypervisors Merge branch 'master' into vpc 2012-07-13 13:52:58 -07:00
network-elements Merge branch 'master' into vpc 2012-07-13 13:52:58 -07:00
storage-allocators/random moving random storage allocator to plugins/storage-allocators 2012-06-26 15:17:25 -07:00
user-authenticators moving out plaintext authenticator to plugins/user-authenticators 2012-06-26 14:33:27 -07:00