percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-13 22:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing merge issue and updating release number

Browse Source
This commit is contained in:
azhebel
2015-08-28 12:55:39 +03:00
parent f2b33773b6
commit a2b966fa24
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/sphinx-build/conf.py
View File

@@ -50,7 +50,7 @@ copyright = u'2015, Percona LLC and/or its affiliates'
# The short X.Y version. # The short X.Y version.
version = '2.2' version = '2.2'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '2.2.14' release = '2.2.15'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

2
docs/release_notes.rst
View File

@@ -1447,8 +1447,6 @@ Changelog
* Fixed bug 1279502: --version-check behaves like spyware * Fixed bug 1279502: --version-check behaves like spyware
=======
>>>>>>> MERGE-SOURCE
v2.2.6 released 2013-12-18 v2.2.6 released 2013-12-18
========================== ==========================