Skip to content

Commit

Permalink
Merge branch '1.6.x' into 1.7.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	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-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-jersey2/gradle.lockfile
#	micrometer-test/gradle.lockfile
#	samples/micrometer-samples-hazelcast3/gradle.lockfile

related: gh-2785
  • Loading branch information
jonatan-ivanov committed Sep 15, 2021
2 parents c62b653 + 59b1916 commit bd55ff4
Show file tree
Hide file tree
Showing 26 changed files with 130 additions and 133 deletions.
10 changes: 5 additions & 5 deletions implementations/micrometer-registry-appoptics/gradle.lockfile

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

10 changes: 5 additions & 5 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.

10 changes: 5 additions & 5 deletions implementations/micrometer-registry-cloudwatch/gradle.lockfile

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

10 changes: 5 additions & 5 deletions implementations/micrometer-registry-cloudwatch2/gradle.lockfile

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

10 changes: 5 additions & 5 deletions implementations/micrometer-registry-datadog/gradle.lockfile

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

10 changes: 5 additions & 5 deletions implementations/micrometer-registry-dynatrace/gradle.lockfile

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

Loading

0 comments on commit bd55ff4

Please sign in to comment.