Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll
2018-06-05 13:30:07 +02:00

View File

@@ -50,6 +50,7 @@ import org.springframework.util.StringUtils;
@Configuration
@AutoConfigureAfter({ MetricsAutoConfiguration.class, DataSourceAutoConfiguration.class,
SimpleMetricsExportAutoConfiguration.class })
@ConditionalOnClass({ DataSource.class, MeterRegistry.class })
@ConditionalOnBean({ DataSource.class, MeterRegistry.class })
public class DataSourcePoolMetricsAutoConfiguration {