From 51392a9f1a2f86543c8ceff3790f3db19fa092a7 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Thu, 8 Aug 2024 13:07:52 -0400 Subject: [PATCH] rebase Signed-off-by: drfaust92 --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 2208e571e5..6299f150b9 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.16.0 +version: 1.17.0 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 37185fa45a..9089cc8c1c 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,10 +1,6 @@ # tempo-distributed -<<<<<<< HEAD -![Version: 1.16.1](https://img.shields.io/badge/Version-1.16.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) -======= -![Version: 1.16.0](https://img.shields.io/badge/Version-1.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) ->>>>>>> b4d4eabf (rebase) +![Version: 1.17.0](https://img.shields.io/badge/Version-1.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo in MicroService mode