From 64701121c9d80a6da420bb431627607610603ff3 Mon Sep 17 00:00:00 2001 From: "KADOTA, Kyohei" Date: Mon, 19 Dec 2022 19:12:03 +0900 Subject: [PATCH] Revert "Release version 0.74.0" --- CHANGELOG.md | 14 ---------- Makefile | 2 +- mackerel-plugin.go | 2 +- packaging/deb-v2/debian/changelog | 25 ------------------ packaging/deb/debian/changelog | 25 ------------------ ...mackerel-agent-plugins_0.73.0.orig.tar.gz} | Bin packaging/rpm/mackerel-agent-plugins-v2.spec | 12 --------- packaging/rpm/mackerel-agent-plugins.spec | 12 --------- 8 files changed, 2 insertions(+), 90 deletions(-) rename packaging/{mackerel-agent-plugins_0.74.0.orig.tar.gz => mackerel-agent-plugins_0.73.0.orig.tar.gz} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cdeeb6ca..52cd87696 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,19 +1,5 @@ # Changelog -## 0.74.0 (2022-12-19) - -* fix packaging process on ci #971 (yseto) -* refine file rewrite process #970 (yseto) -* remove xentop on backward compatibility symlink #969 (yseto) -* fix packaging #968 (yseto) -* [plugin-elasticsearch] Fix the test for elasticsearch #966 (lufia) -* sort plugins on packaging files. #963 (yseto) -* Purge less-used plugins from mackerel-agent-plugins package #962 (lufia) -* Purge mackerel-plugin-nvidia-smi #961 (lufia) -* Update dependencies #960 (lufia) -* added test for elasticsearch #952 (yseto) - - ## 0.73.0 (2022-11-09) * Fix Elasticsearch plugin. #950 (fujiwara) diff --git a/Makefile b/Makefile index e74bda170..80302f6dc 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = 0.74.0 +VERSION = 0.73.0 VERBOSE_FLAG = $(if $(VERBOSE),-verbose) CURRENT_REVISION = $(shell git rev-parse --short HEAD) diff --git a/mackerel-plugin.go b/mackerel-plugin.go index 3a48ce328..cce3035dd 100644 --- a/mackerel-plugin.go +++ b/mackerel-plugin.go @@ -60,7 +60,7 @@ func run(args []string) int { return exitOK } -const version = "0.74.0" +const version = "0.73.0" var gitcommit string diff --git a/packaging/deb-v2/debian/changelog b/packaging/deb-v2/debian/changelog index 4fb8ad21b..2792d4374 100644 --- a/packaging/deb-v2/debian/changelog +++ b/packaging/deb-v2/debian/changelog @@ -1,28 +1,3 @@ -mackerel-agent-plugins (0.74.0-1.v2) stable; urgency=low - - * fix packaging process on ci (by yseto) - - * refine file rewrite process (by yseto) - - * remove xentop on backward compatibility symlink (by yseto) - - * fix packaging (by yseto) - - * [plugin-elasticsearch] Fix the test for elasticsearch (by lufia) - - * sort plugins on packaging files. (by yseto) - - * Purge less-used plugins from mackerel-agent-plugins package (by lufia) - - * Purge mackerel-plugin-nvidia-smi (by lufia) - - * Update dependencies (by lufia) - - * added test for elasticsearch (by yseto) - - - -- mackerel Mon, 19 Dec 2022 02:57:05 +0000 - mackerel-agent-plugins (0.73.0-1.v2) stable; urgency=low * Fix Elasticsearch plugin. (by fujiwara) diff --git a/packaging/deb/debian/changelog b/packaging/deb/debian/changelog index bcfb68130..f49d191bb 100644 --- a/packaging/deb/debian/changelog +++ b/packaging/deb/debian/changelog @@ -1,28 +1,3 @@ -mackerel-agent-plugins (0.74.0-1) stable; urgency=low - - * fix packaging process on ci (by yseto) - - * refine file rewrite process (by yseto) - - * remove xentop on backward compatibility symlink (by yseto) - - * fix packaging (by yseto) - - * [plugin-elasticsearch] Fix the test for elasticsearch (by lufia) - - * sort plugins on packaging files. (by yseto) - - * Purge less-used plugins from mackerel-agent-plugins package (by lufia) - - * Purge mackerel-plugin-nvidia-smi (by lufia) - - * Update dependencies (by lufia) - - * added test for elasticsearch (by yseto) - - - -- mackerel Mon, 19 Dec 2022 02:57:05 +0000 - mackerel-agent-plugins (0.73.0-1) stable; urgency=low * Fix Elasticsearch plugin. (by fujiwara) diff --git a/packaging/mackerel-agent-plugins_0.74.0.orig.tar.gz b/packaging/mackerel-agent-plugins_0.73.0.orig.tar.gz similarity index 100% rename from packaging/mackerel-agent-plugins_0.74.0.orig.tar.gz rename to packaging/mackerel-agent-plugins_0.73.0.orig.tar.gz diff --git a/packaging/rpm/mackerel-agent-plugins-v2.spec b/packaging/rpm/mackerel-agent-plugins-v2.spec index 35b04eb73..85ebc38c0 100644 --- a/packaging/rpm/mackerel-agent-plugins-v2.spec +++ b/packaging/rpm/mackerel-agent-plugins-v2.spec @@ -39,18 +39,6 @@ done %{__targetdir}/* %changelog -* Mon Dec 19 2022 - 0.74.0 -- fix packaging process on ci (by yseto) -- refine file rewrite process (by yseto) -- remove xentop on backward compatibility symlink (by yseto) -- fix packaging (by yseto) -- [plugin-elasticsearch] Fix the test for elasticsearch (by lufia) -- sort plugins on packaging files. (by yseto) -- Purge less-used plugins from mackerel-agent-plugins package (by lufia) -- Purge mackerel-plugin-nvidia-smi (by lufia) -- Update dependencies (by lufia) -- added test for elasticsearch (by yseto) - * Wed Nov 9 2022 - 0.73.0 - Fix Elasticsearch plugin. (by fujiwara) - Bump github.com/stretchr/testify from 1.8.0 to 1.8.1 (by dependabot[bot]) diff --git a/packaging/rpm/mackerel-agent-plugins.spec b/packaging/rpm/mackerel-agent-plugins.spec index 3baf29b4e..60503e2a5 100644 --- a/packaging/rpm/mackerel-agent-plugins.spec +++ b/packaging/rpm/mackerel-agent-plugins.spec @@ -48,18 +48,6 @@ done %{__oldtargetdir}/* %changelog -* Mon Dec 19 2022 - 0.74.0 -- fix packaging process on ci (by yseto) -- refine file rewrite process (by yseto) -- remove xentop on backward compatibility symlink (by yseto) -- fix packaging (by yseto) -- [plugin-elasticsearch] Fix the test for elasticsearch (by lufia) -- sort plugins on packaging files. (by yseto) -- Purge less-used plugins from mackerel-agent-plugins package (by lufia) -- Purge mackerel-plugin-nvidia-smi (by lufia) -- Update dependencies (by lufia) -- added test for elasticsearch (by yseto) - * Wed Nov 9 2022 - 0.73.0 - Fix Elasticsearch plugin. (by fujiwara) - Bump github.com/stretchr/testify from 1.8.0 to 1.8.1 (by dependabot[bot])