cloudstack/server
Rohit Yadav df3dea58a2 CLOUDSTACK-6139: Fix regression, allow zone level systemvm localstorage config
From b3f18e7d74, the zone level systemvm local
storage setting never worked as it needed to be moved to config depot.

(cherry picked from commit 279efb0432)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2015-05-01 15:27:40 +02:00
..
conf Summary: Updated sudoers approved commands for cloud user 2013-10-23 13:42:16 -07:00
resources Merge branch 'volume-upload' into master 2015-04-29 11:12:53 +05:30
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src CLOUDSTACK-6139: Fix regression, allow zone level systemvm localstorage config 2015-05-01 15:27:40 +02:00
test Bump priority stragety is no longer used for redundant virtual routers 2015-04-02 21:50:49 +02:00
pom.xml volume upload: added httpcomponents server and removed nio server 2015-01-16 17:15:14 +05:30