Skip to content

Commit 87c9164

Browse files
jonatan-ivanovjonatan-ivanov
committed
Merge branch '1.9.x'
# Conflicts: # benchmarks/benchmarks-core/gradle.lockfile # implementations/micrometer-registry-appoptics/gradle.lockfile # implementations/micrometer-registry-atlas/gradle.lockfile # implementations/micrometer-registry-azure-monitor/gradle.lockfile # implementations/micrometer-registry-cloudwatch/gradle.lockfile # implementations/micrometer-registry-cloudwatch2/gradle.lockfile # implementations/micrometer-registry-datadog/gradle.lockfile # implementations/micrometer-registry-dynatrace/gradle.lockfile # implementations/micrometer-registry-elastic/gradle.lockfile # implementations/micrometer-registry-ganglia/gradle.lockfile # implementations/micrometer-registry-graphite/gradle.lockfile # implementations/micrometer-registry-health/gradle.lockfile # implementations/micrometer-registry-humio/gradle.lockfile # implementations/micrometer-registry-influx/gradle.lockfile # implementations/micrometer-registry-jmx/gradle.lockfile # implementations/micrometer-registry-kairos/gradle.lockfile # implementations/micrometer-registry-new-relic/gradle.lockfile # implementations/micrometer-registry-opentsdb/gradle.lockfile # implementations/micrometer-registry-otlp/gradle.lockfile # implementations/micrometer-registry-prometheus/gradle.lockfile # implementations/micrometer-registry-signalfx/gradle.lockfile # implementations/micrometer-registry-stackdriver/gradle.lockfile # implementations/micrometer-registry-statsd/gradle.lockfile # implementations/micrometer-registry-wavefront/gradle.lockfile # micrometer-core/gradle.lockfile # micrometer-test/gradle.lockfile # samples/micrometer-samples-boot2-reactive/gradle.lockfile # samples/micrometer-samples-boot2/gradle.lockfile # samples/micrometer-samples-core/gradle.lockfile # samples/micrometer-samples-hazelcast/gradle.lockfile # samples/micrometer-samples-hazelcast3/gradle.lockfile # samples/micrometer-samples-javalin/gradle.lockfile # samples/micrometer-samples-jersey3/gradle.lockfile # samples/micrometer-samples-spring-integration/gradle.lockfile
2 parents d2cd322 + 31e906e commit 87c9164

File tree

38 files changed

+320
-317
lines changed

38 files changed

+320
-317
lines changed

‎benchmarks/benchmarks-core/gradle.lockfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎implementations/micrometer-registry-appoptics/gradle.lockfile

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎implementations/micrometer-registry-atlas/gradle.lockfile

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎implementations/micrometer-registry-azure-monitor/gradle.lockfile

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎implementations/micrometer-registry-cloudwatch/gradle.lockfile

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)