Skip to content

Commit

Permalink
Merge f941155 into 3e9c39e
Browse files Browse the repository at this point in the history
  • Loading branch information
daiksy committed Oct 26, 2015
2 parents 3e9c39e + f941155 commit 3486cdb
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ deploy:
api_key:
secure: vmMQz+IjJ/LUa9SHAlLKyg4raSqkEBIRzqnjS1LK7ZjtcAROo6Pn0lUcC4qMZ96/VvNMdLyGndCOBXsdE2VBCY5goTI7uIW1oxbLM3qOMNQQldG1bOY34bjkiiDU15WLUsKKPEC2RdgwG1aAAsqcUDAeyRABYVBANSn9jylQnBC2b2mQMYUtVA1O9jl3Qg64Cy6MUUirE/SuKp/cnE3AakcQt54pNVsnM54bIyrbGhqThLj7p7uLJEm58oRWR7TTUSgmk/Rbj4aJSC4k5lzN9iL/Fr5AgnpEQQUg3ishE+5yqSW7f/PRqXC6ZI9p6XS7bhS8N178ImzouIsoKWltblsgUhfvE6ONyMpi1+RG+6Lp3HlpLuq0Pz/efEpcaSDg6lXDIvMBC2sA5pbPok6Yx4tJOSv8adWu9t0yGVJezYaqbN/071K9m3cM4YTQK4L39b2FxQ2ZrUhee8HZy5rDO8iqx2vgM+NXATz2L5Tjjzd4aqfIDX8R3PVImBci7se/wmamDUpOrcfSjrI2dzEQGBzBfIFIhCaCQSuEjpZqBKdcOztkn1uev7a0AAUeZ7my+uQNpAMO7/AapM7LLugmkLM06FgrHKWDPQP/T92MPyvmC04nNraetAVijVYLQnlK5+TdEMvkKHuY5afLp5mEzX+7jTSmjyaUNrbANs8bH/8=
file:
- "/home/travis/rpmbuild/RPMS/noarch/mackerel-check-plugins-0.0.4-1.noarch.rpm"
- "/home/travis/gopath/src/github.com/mackerelio/go-check-plugins/packaging/mackerel-check-plugins_0.0.4-1_all.deb"
- "/home/travis/rpmbuild/RPMS/noarch/mackerel-check-plugins-0.0.5-1.noarch.rpm"
- "/home/travis/gopath/src/github.com/mackerelio/go-check-plugins/packaging/mackerel-check-plugins_0.0.5-1_all.deb"
on:
repo: mackerelio/go-check-plugins
all_branches: true
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 0.0.5 (2015-10-26)

* Add mysql in packages

## 0.0.4 (2015-10-26)

* Refactor Mysql checks #20 (Songmu)
Expand Down
3 changes: 2 additions & 1 deletion packaging/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"file-age",
"http",
"load",
"procs"
"procs",
"mysql"
]
}
6 changes: 6 additions & 0 deletions packaging/deb/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
mackerel-check-plugins (0.0.5-1) stable; urgency=low

* Add mysql in packages

-- daiksy <daiksy@hatena.ne.jp> Mon, 26 Oct 2015 17:42:22 +0900

mackerel-check-plugins (0.0.4-1) stable; urgency=low

* Refactor Mysql checks (by Songmu)
Expand Down
2 changes: 1 addition & 1 deletion packaging/deb/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package=mackerel-check-plugins
override_dh_auto_install:
dh_auto_install
install -d -m 755 debian/tmp/usr/local/bin
for i in file-age http load procs;do \
for i in file-age http load procs mysql;do \
install -m755 debian/check-$$i debian/tmp/usr/local/bin; \
done

Expand Down
7 changes: 5 additions & 2 deletions packaging/rpm/mackerel-check-plugins.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
%define __targetdir /usr/local/bin

Name: mackerel-check-plugins
Version: 0.0.4
Version: 0.0.5
Release: 1
License: Commercial
Summary: macekrel.io check plugins
Expand All @@ -25,7 +25,7 @@ mackerel.io check plugins

%{__mkdir} -p %{buildroot}%{__targetdir}

for i in file-age http load procs;do \
for i in file-age http load procs mysql;do \
%{__install} -m0755 %{_sourcedir}/build/check-$i %{buildroot}%{__targetdir}/; \
done

Expand All @@ -37,6 +37,9 @@ done
%{__targetdir}

%changelog
* Mon Oct 26 2015 <daiksy@hatena.ne.jp> - 0.0.5
- Add mysql in packages

* Mon Oct 26 2015 <daiksy@hatena.ne.jp> - 0.0.4
- Refactor Mysql checks (by Songmu)
- Add Mysql checks (by hiroakis)
Expand Down

0 comments on commit 3486cdb

Please sign in to comment.