Skip to content

Commit

Permalink
Merge branch '1.9.x' into 1.10.x
Browse files Browse the repository at this point in the history
# 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
  • Loading branch information
jonatan-ivanov committed May 5, 2023
2 parents 5561296 + eed4119 commit 7e4992b
Show file tree
Hide file tree
Showing 41 changed files with 570 additions and 564 deletions.
12 changes: 6 additions & 6 deletions benchmarks/benchmarks-core/gradle.lockfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions implementations/micrometer-registry-appoptics/gradle.lockfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions implementations/micrometer-registry-atlas/gradle.lockfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions implementations/micrometer-registry-cloudwatch/gradle.lockfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 19 additions & 19 deletions implementations/micrometer-registry-cloudwatch2/gradle.lockfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7e4992b

Please sign in to comment.