Murali Reddy b8a28dfae3 CLOUDSTACK-7144: No GSLB provider is available during assigning load ... balancing rule this fix ensures any bean implementing GslbProvider interface are injected into GlobalLoadBalancingRulesServiceImpl. (cherry picked from commit 9dc322d46f) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Conflicts: server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java		2014-11-25 19:50:37 +05:30
..
resources/META-INF/cloudstack	CLOUDSTACK-7144: No GSLB provider is available during assigning load	2014-11-25 19:50:37 +05:30
src	Applying missed patch from CLOUDSTACK-6204	2014-05-14 00:26:11 -07:00
test	CLOUDSTACK-5329: fix NPE in storage migration for zone-wide primary storage, and also the serization error.	2014-01-03 16:44:21 -08:00
pom.xml	Revert "Revert "Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path""	2014-11-21 18:04:33 +05:30