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

[Daniel Nichter]

=== modified file 'docs/release_notes.rst'
--- docs/release_notes.rst	2014-02-20 08:10:16 +0000
+++ docs/release_notes.rst	2014-04-20 19:46:55 +0000
@@ -1,6 +1,7 @@
 Release Notes
 *************
 
+<<<<<<< TREE
 v2.2.7 released 2014-02-20
 ==========================
 
@@ -1191,6 +1192,19 @@
 
 * Fixed bug 1279502: --version-check behaves like spyware
 
+=======
+v2.2.7 released 2013-02-20
+==========================
+
+Percona Toolkit 2.2.7 has been released. This release has only one bug fixed. 
+
+* Fixed bug 1279502: --version-check behaves like spyware
+
+  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.
+
+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/).
+
+>>>>>>> MERGE-SOURCE
 v2.2.6 released 2013-12-18
 ==========================