Merge lp:~percona-toolkit-dev/percona-monitoring-plugins/extra-tarball-directory-fix-bug-934227 into lp:percona-monitoring-plugins/1.0

Proposed by Baron Schwartz
Status: Merged
Merged at revision: 92
Proposed branch: lp:~percona-toolkit-dev/percona-monitoring-plugins/extra-tarball-directory-fix-bug-934227
Merge into: lp:percona-monitoring-plugins/1.0
Diff against target: 26 lines (+4/-1)
2 files modified
Changelog (+1/-0)
make.sh (+3/-1)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-monitoring-plugins/extra-tarball-directory-fix-bug-934227
Reviewer Review Type Date Requested Status
Baron Schwartz (community) Approve
Review via email: mp+100153@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Baron Schwartz (baron-xaprb) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Changelog'
2--- Changelog 2012-03-19 02:43:35 +0000
3+++ Changelog 2012-03-30 14:03:28 +0000
4@@ -6,6 +6,7 @@
5 * HTTP status was not fetched correctly when $use_ssh was disabled (bug 937017).
6 * MongoDB didn't support --port2 (bug 937018).
7 * Percona Server response time graph didn't tolerate <> 14 rows (bug 954118).
8+ * The release tarball had an extra directory (bug 934227).
9
10 2012-02-16: version 0.9.0
11 -------------------------
12
13=== modified file 'make.sh'
14--- make.sh 2012-02-17 01:33:44 +0000
15+++ make.sh 2012-03-30 14:03:28 +0000
16@@ -117,7 +117,9 @@
17 # Make the release tarball
18 NAME="percona-monitoring-plugins-${VERSION}"
19 mv release/code "release/${NAME}"
20-tar zcf "release/${NAME}.tar.gz" "release/${NAME}"
21+cd release
22+tar zcf "${NAME}.tar.gz" "${NAME}"
23+cd ..
24
25 echo "The documentation is complete in HTML format."
26 echo "It is in the release/docs/html directory."

Subscribers

People subscribed via source and target branches