Merge lp:~percona-toolkit-dev/percona-toolkit/release-2.2.7 into lp:percona-toolkit/2.2

Proposed by Daniel Nichter
Status: Merged
Merged at revision: 598
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/release-2.2.7
Merge into: lp:percona-toolkit/2.2
Diff against target: 30 lines (+14/-0) (has conflicts)
1 file modified
docs/release_notes.rst (+14/-0)
Text conflict in docs/release_notes.rst
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/release-2.2.7
Reviewer Review Type Date Requested Status
Daniel Nichter Pending
Review via email: mp+216555@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/release_notes.rst'
2--- docs/release_notes.rst 2014-02-20 08:10:16 +0000
3+++ docs/release_notes.rst 2014-04-20 19:46:55 +0000
4@@ -1,6 +1,7 @@
5 Release Notes
6 *************
7
8+<<<<<<< TREE
9 v2.2.7 released 2014-02-20
10 ==========================
11
12@@ -1191,6 +1192,19 @@
13
14 * Fixed bug 1279502: --version-check behaves like spyware
15
16+=======
17+v2.2.7 released 2013-02-20
18+==========================
19+
20+Percona Toolkit 2.2.7 has been released. This release has only one bug fixed.
21+
22+* Fixed bug 1279502: --version-check behaves like spyware
23+
24+ The configuration for what information PT tools should collect was not hardcoded in the scripts. Instead, every time it's downloaded from http://v.percona.com/. One of the possible parameters was a binary file name to be executed. This was fixed by removing the remote execution.
25+
26+Percona Toolkit packages can be downloaded from http://www.percona.com/downloads/percona-toolkit/ or the Percona Software Repositories (http://www.percona.com/software/repositories/).
27+
28+>>>>>>> MERGE-SOURCE
29 v2.2.6 released 2013-12-18
30 ==========================
31

Subscribers

People subscribed via source and target branches