Merge branch '1.6.x' into 1.7.x

# Conflicts: # implementations/micrometer-registry-wavefront/gradle.lockfile # samples/micrometer-samples-boot2/gradle.lockfile # samples/micrometer-samples-core/gradle.lockfile related: gh-2784
micrometer-metrics · Sep 15, 2021 · c62b653 · c62b653
2 parents 490e0fb + 6bb07d7
commit c62b653
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 26 deletions.
diff --git a/implementations/micrometer-registry-wavefront/gradle.lockfile b/implementations/micrometer-registry-wavefront/gradle.lockfile
diff --git a/samples/micrometer-samples-boot2/gradle.lockfile b/samples/micrometer-samples-boot2/gradle.lockfile
diff --git a/samples/micrometer-samples-core/gradle.lockfile b/samples/micrometer-samples-core/gradle.lockfile