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-core/gradle.lockfile
#	samples/micrometer-samples-hazelcast3/gradle.lockfile
#	samples/micrometer-samples-jersey3/gradle.lockfile
  • Loading branch information
jonatan-ivanov committed Feb 13, 2023
2 parents ce4819c + 2c237a1 commit 9061a07
Show file tree
Hide file tree
Showing 38 changed files with 416 additions and 416 deletions.
4 changes: 2 additions & 2 deletions benchmarks/benchmarks-core/gradle.lockfile

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-appoptics/gradle.lockfile

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-atlas/gradle.lockfile

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-azure-monitor/gradle.lockfile

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.

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

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

Loading

0 comments on commit 9061a07

Please sign in to comment.