From e4bdd4cf2996c472698f9192df99965a0b2d8f5f Mon Sep 17 00:00:00 2001 From: Richie Artoul Date: Tue, 22 Oct 2024 13:52:06 -0500 Subject: [PATCH 1/3] upgrade to v591 --- charts/warpstream-agent/CHANGELOG.md | 15 +++++++++++++++ charts/warpstream-agent/Chart.yaml | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/charts/warpstream-agent/CHANGELOG.md b/charts/warpstream-agent/CHANGELOG.md index 9e658c5..371af15 100644 --- a/charts/warpstream-agent/CHANGELOG.md +++ b/charts/warpstream-agent/CHANGELOG.md @@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +<<<<<<< Updated upstream +======= +## [0.13.36] - 2024-10-22 + +### Added + +- Update WarpStream Agent to v591. + +## [0.13.36] - 2024-10-19 + +### Added + +- Remove limit on ephemeral storage in chart as its unnecessary. + +>>>>>>> Stashed changes ## [0.13.36] - 2024-10-17 ### Added diff --git a/charts/warpstream-agent/Chart.yaml b/charts/warpstream-agent/Chart.yaml index 3116973..3c615d2 100644 --- a/charts/warpstream-agent/Chart.yaml +++ b/charts/warpstream-agent/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: warpstream-agent description: WarpStream Agent for Kubernetes. type: application -version: 0.13.36 -appVersion: v590 +version: 0.13.38 +appVersion: v591 icon: https://avatars.githubusercontent.com/u/132156278 home: https://docs.warpstream.com/warpstream/ sources: From 11e68f196adecce809e37ca5b0569b1805dca843 Mon Sep 17 00:00:00 2001 From: Richie Artoul Date: Tue, 22 Oct 2024 13:52:31 -0500 Subject: [PATCH 2/3] fix merge --- charts/warpstream-agent/CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/charts/warpstream-agent/CHANGELOG.md b/charts/warpstream-agent/CHANGELOG.md index 371af15..8643387 100644 --- a/charts/warpstream-agent/CHANGELOG.md +++ b/charts/warpstream-agent/CHANGELOG.md @@ -5,8 +5,6 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -<<<<<<< Updated upstream -======= ## [0.13.36] - 2024-10-22 ### Added @@ -19,7 +17,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Remove limit on ephemeral storage in chart as its unnecessary. ->>>>>>> Stashed changes ## [0.13.36] - 2024-10-17 ### Added From 3dc28053ddbdc6b92ccb443d02913a9250fa7a0b Mon Sep 17 00:00:00 2001 From: Richie Artoul Date: Tue, 22 Oct 2024 13:53:01 -0500 Subject: [PATCH 3/3] fix again --- charts/warpstream-agent/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/warpstream-agent/CHANGELOG.md b/charts/warpstream-agent/CHANGELOG.md index 8643387..4fa2466 100644 --- a/charts/warpstream-agent/CHANGELOG.md +++ b/charts/warpstream-agent/CHANGELOG.md @@ -5,13 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.13.36] - 2024-10-22 +## [0.13.38] - 2024-10-22 ### Added - Update WarpStream Agent to v591. -## [0.13.36] - 2024-10-19 +## [0.13.37] - 2024-10-19 ### Added