Skip to content

Commit

Permalink
Merge branch '1.10.x' into 1.11.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jonatan-ivanov committed Sep 26, 2023
2 parents e96dd42 + 31726a0 commit db78517
Show file tree
Hide file tree
Showing 8 changed files with 88 additions and 88 deletions.
12 changes: 6 additions & 6 deletions micrometer-core/gradle.lockfile

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

12 changes: 6 additions & 6 deletions micrometer-observation/gradle.lockfile

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

2 changes: 1 addition & 1 deletion samples/micrometer-samples-boot2-reactive/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.15'
id 'org.springframework.boot' version '2.7.16'
}

apply plugin: 'io.spring.dependency-management'
Expand Down
40 changes: 20 additions & 20 deletions samples/micrometer-samples-boot2-reactive/gradle.lockfile

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

2 changes: 1 addition & 1 deletion samples/micrometer-samples-boot2/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.15'
id 'org.springframework.boot' version '2.7.16'
}

apply plugin: 'io.spring.dependency-management'
Expand Down
Loading

0 comments on commit db78517

Please sign in to comment.