From f396740a2f43fb60643bcdeb86d9252e22592cc3 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 28 Sep 2017 07:46:01 +0100
Subject: [PATCH] Rename Micrometer Clock bean: clock -> micrometerClock

Closes gh-10436
---
 .../metrics/export/simple/SimpleExportConfiguration.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleExportConfiguration.java b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleExportConfiguration.java
index da7147694e2..d671ebdb3f3 100644
--- a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleExportConfiguration.java
+++ b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleExportConfiguration.java
@@ -45,7 +45,7 @@ public class SimpleExportConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public Clock clock() {
+	public Clock micrometerClock() {
 		return Clock.SYSTEM;
 	}