Merge branch '1.6.x' into 1.7.x

# Conflicts: # implementations/micrometer-registry-graphite/gradle.lockfile # implementations/micrometer-registry-statsd/gradle.lockfile # micrometer-core/gradle.lockfile # micrometer-test/gradle.lockfile # samples/micrometer-samples-core/gradle.lockfile
micrometer-metrics · Aug 11, 2021 · 0704cb7 · 0704cb7
2 parents 5c9682c + 7087d4a
commit 0704cb7
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 70 deletions.
diff --git a/implementations/micrometer-registry-graphite/gradle.lockfile b/implementations/micrometer-registry-graphite/gradle.lockfile
diff --git a/implementations/micrometer-registry-statsd/gradle.lockfile b/implementations/micrometer-registry-statsd/gradle.lockfile
diff --git a/micrometer-core/gradle.lockfile b/micrometer-core/gradle.lockfile
diff --git a/micrometer-test/gradle.lockfile b/micrometer-test/gradle.lockfile
diff --git a/samples/micrometer-samples-core/gradle.lockfile b/samples/micrometer-samples-core/gradle.lockfile