Skip to content

Commit

Permalink
update version (conan-io#1541)
Browse files Browse the repository at this point in the history
  • Loading branch information
czoido authored Jan 31, 2020
1 parent ff560ec commit 3d0ef62
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
8 changes: 8 additions & 0 deletions changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ Check https://github.com/conan-io/conan for issues and more details about develo
Conan 1.21 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please submit a report on GitHub.
Read more about the :ref:`Conan stability commitment<stability>`.

1.21.2 (31-Jan-2020)
--------------------

- Fix: Recipe substitution for scm (old behavior) fixed for multiline comments in Python 3.8 `#6439 <https://github.com/conan-io/conan/pull/6439>`_
- Bugfix: Fix broken compression of .tgz files due to Python 3.8 changing tar default schema. `#6439 <https://github.com/conan-io/conan/pull/6439>`_
- Bugfix: Append `CONAN_LIBS` in `cmake` generator to avoid overwriting user-defined libs. `#6433 <https://github.com/conan-io/conan/pull/6433>`_


1.21.1 (14-Jan-2020)
--------------------

Expand Down
2 changes: 1 addition & 1 deletion conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# The short X.Y version.
version = "1.21"
# The full version, including alpha/beta/rc tags.
release = u'1.21.1'
release = u'1.21.2'

dir_path = os.path.dirname(os.path.realpath(__file__))
if not os.path.exists(os.path.join(dir_path, "versions.json")):
Expand Down

0 comments on commit 3d0ef62

Please sign in to comment.