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
..
console-proxy	removed unused static main in ConsoleProxyPasswordBasedEncryptor	2015-04-17 12:07:04 +05:30
console-proxy-rdp/rdpconsole	utils: use a better extended implementation of SSLSocketFactory	2015-03-13 17:32:07 +05:30
iam	Merge branch 'volume-upload' into master	2015-04-29 11:12:53 +05:30
secondary-storage	CLOUDSTACK-6139: Fix regression, allow zone level systemvm localstorage config	2015-05-01 15:27:40 +02: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