Merge remote-tracking branch 'origin/#1095-add-support-for-kafka' int… · mmaia/micrometer@4b96e93 · GitHub

Commit

Merge remote-tracking branch 'origin/micrometer-metrics#1095-add-supp…

Browse files

…ort-for-kafka' into micrometer-metrics#1095-add-support-for-kafka

# Conflicts:
#	micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaClientMetrics.java

Loading branch information

mmaia committed May 4, 2019

2 parents 4387b71 + de62ef9 commit 4b96e93