Rohit Yadav df3dea58a2 CLOUDSTACK-6139: Fix regression, allow zone level systemvm localstorage config ...

From b3f18e7d74a0f09db9977554a6c7648b7edbc33d, the zone level systemvm local
storage setting never worked as it needed to be moved to config depot.

(cherry picked from commit 279efb04324249a2e1a5487b58b40a723baf4600)
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

..

resources/META-INF/cloudstack/elb

Add missing licenses

2013-10-23 15:20:08 -07:00

src/com/cloud/network

CLOUDSTACK-6139: Fix regression, allow zone level systemvm localstorage config

2015-05-01 15:27:40 +02:00

test/com/cloud/network/lb

Fix findbugs findings in cloud-plugin-network-elb

2014-02-14 18:37:46 +01:00

pom.xml

Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT

2014-10-29 14:54:23 +01:00