Skip to content

Commit

Permalink
Merge 3c114da into 9324b62
Browse files Browse the repository at this point in the history
  • Loading branch information
hayajo committed Aug 30, 2018
2 parents 9324b62 + 3c114da commit 1ec2e06
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 2 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 0.32.0 (2018-08-30)

* logs to Stderr #167 (Songmu)
* Omit symbol table and debug information from the executable #166 (itchyny)
* fix Dockerfile to create alpine based docker image #163 (hayajo)


## 0.31.1 (2018-07-04)

* Fix mkr throw --retry not working #161 (astj)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BIN = mkr
VERSION = 0.31.1
VERSION = 0.32.0
CURRENT_REVISION = $(shell git rev-parse --short HEAD)

all: clean cross lint gofmt test rpm deb
Expand Down
11 changes: 11 additions & 0 deletions packaging/deb-v2/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
mkr (0.32.0-1.v2) stable; urgency=low

* logs to Stderr (by Songmu)
<https://github.com/mackerelio/mkr/pull/167>
* Omit symbol table and debug information from the executable (by itchyny)
<https://github.com/mackerelio/mkr/pull/166>
* fix Dockerfile to create alpine based docker image (by hayajo)
<https://github.com/mackerelio/mkr/pull/163>

-- mackerel <mackerel-developers@hatena.ne.jp> Thu, 30 Aug 2018 10:51:35 +0900

mkr (0.31.1-1.v2) stable; urgency=low

* Fix mkr throw --retry not working (by astj)
Expand Down
11 changes: 11 additions & 0 deletions packaging/deb/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
mkr (0.32.0-1) stable; urgency=low

* logs to Stderr (by Songmu)
<https://github.com/mackerelio/mkr/pull/167>
* Omit symbol table and debug information from the executable (by itchyny)
<https://github.com/mackerelio/mkr/pull/166>
* fix Dockerfile to create alpine based docker image (by hayajo)
<https://github.com/mackerelio/mkr/pull/163>

-- mackerel <mackerel-developers@hatena.ne.jp> Thu, 30 Aug 2018 10:51:35 +0900

mkr (0.31.1-1) stable; urgency=low

* Fix mkr throw --retry not working (by astj)
Expand Down
File renamed without changes.
5 changes: 5 additions & 0 deletions packaging/rpm/mkr-v2.spec
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ rm -f %{buildroot}%{_bindir}/%{name}
%{_bindir}/%{name}

%changelog
* Thu Aug 30 2018 <mackerel-developers@hatena.ne.jp> - 0.32.0
- logs to Stderr (by Songmu)
- Omit symbol table and debug information from the executable (by itchyny)
- fix Dockerfile to create alpine based docker image (by hayajo)

* Wed Jul 04 2018 <mackerel-developers@hatena.ne.jp> - 0.31.1
- Fix mkr throw --retry not working (by astj)

Expand Down
5 changes: 5 additions & 0 deletions packaging/rpm/mkr.spec
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ rm -f %{buildroot}%{_bindir}/${name}
%{_localbindir}/%{name}

%changelog
* Thu Aug 30 2018 <mackerel-developers@hatena.ne.jp> - 0.32.0
- logs to Stderr (by Songmu)
- Omit symbol table and debug information from the executable (by itchyny)
- fix Dockerfile to create alpine based docker image (by hayajo)

* Wed Jul 04 2018 <mackerel-developers@hatena.ne.jp> - 0.31.1
- Fix mkr throw --retry not working (by astj)

Expand Down
2 changes: 1 addition & 1 deletion version.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package main

const version = "0.31.1"
const version = "0.32.0"

var gitcommit string

0 comments on commit 1ec2e06

Please sign in to comment.