Merge pull request #27 from mackerelio/bump-version-0.7.0

Release version 0.7.0
mackerelio · Oct 26, 2015 · 10f7c95 · 10f7c95
2 parents 5eb575e + ba36789
commit 10f7c95
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,8 +21,8 @@ deploy:
   api_key:
     secure: Rzt3UJJnYi51r53yVpvg+5McqPEV+qLig6VPW+2V9hrSzd+25bJtoOesuWdKneHeeEkTivTzH3SillWdEDFlQdr+HBh/Th3n0M9GHKYMtI+b9z5BeqZWqJ8lSCICdTRmOwarUWSIV33JwgQ3og/bxVEGTRmqMpYMrPHWSBWGGeQ=
   file:
-    - "/home/travis/rpmbuild/RPMS/noarch/mkr-0.6.0-1.noarch.rpm"
-    - "/home/travis/gopath/src/github.com/mackerelio/mkr/packaging/mkr_0.6.0-1_all.deb"
+    - "/home/travis/rpmbuild/RPMS/noarch/mkr-0.7.0-1.noarch.rpm"
+    - "/home/travis/gopath/src/github.com/mackerelio/mkr/packaging/mkr_0.7.0-1_all.deb"
     - "/home/travis/gopath/src/github.com/mackerelio/mkr/snapshot/mkr_linux_amd64"
     - "/home/travis/gopath/src/github.com/mackerelio/mkr/snapshot/mkr_linux_386"
     - "/home/travis/gopath/src/github.com/mackerelio/mkr/snapshot/mkr_darwin_amd64"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.7.0 (2015-10-26)
+
+* append newline to the end of monitors.json #23 (Songmu)
+* fix printMonitor #24 (Songmu)
+* fix diff output between slices #25 (Songmu)
+
+
 ## 0.6.0 (2015-10-15)
 
 * Fix update command bug about overwriting hostname #17 (y_uuki) 

diff --git a/packaging/deb/debian/changelog b/packaging/deb/debian/changelog
@@ -1,3 +1,14 @@
+mkr (0.7.0-1) stable; urgency=low
+
+  * append newline to the end of monitors.json (by Songmu)
+    <https://github.com/mackerelio/mkr/pull/23>
+  * fix printMonitor (by Songmu)
+    <https://github.com/mackerelio/mkr/pull/24>
+  * fix diff output between slices (by Songmu)
+    <https://github.com/mackerelio/mkr/pull/25>
+
+ -- daiksy <daiksy@hatena.ne.jp>  Mon, 26 Oct 2015 15:42:07 +0900
+
 mkr (0.6.0-1) stable; urgency=low
 
  * Fix update command bug about overwriting hostname (by y_uuki)

diff --git a/packaging/rpm/mkr.spec b/packaging/rpm/mkr.spec
@@ -5,7 +5,7 @@
 %define _localbindir /usr/local/bin
 
 Name:      mkr
-Version:   0.6.0
+Version:   0.7.0
 Release:   1
 License:   Apache-2.0
 Summary:   macekrel.io api client tool
@@ -42,6 +42,11 @@ rm -f %{buildroot}%{_bindir}/${name}
 %{_localbindir}/%{name}
 
 %changelog
+* Mon Oct 26 2015 <daiksy@hatena.ne.jp> - 0.7.0-1
+- append newline to the end of monitors.json (by Songmu)
+- fix printMonitor (by Songmu)
+- fix diff output between slices (by Songmu)
+
 * Thu Oct 15 2015 <itchyny@hatena.ne.jp> - 0.6.0-1
 - Fix update command bug about overwriting hostname (by y_uuki)
 - Stop the parallel request sending temporarily (by y_uuki)