Skip to content

Merge 1.21.3 to master #1574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
czoido merged 4 commits into from
Mar 3, 2020
Merged

Merge 1.21.3 to master #1574

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1db72b4
update version
czoido Jan 31, 2020
8773d2a
change version
czoido Mar 3, 2020
17c84d8
Merge branch 'master' into merge_1.21.3_to_master
czoido Mar 3, 2020
709f252
fix version
czoido Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Check https://github.com/conan-io/conan for issues and more details about develo

.. important::

Conan 1.21 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please submit a report on GitHub.
Conan 1.22 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.22.2 (13-Feb-2020)
Expand Down Expand Up @@ -77,6 +77,16 @@ Check https://github.com/conan-io/conan for issues and more details about develo
- Bugfix: :command:`conan inspect` now is able to properly show name and version coming from ``set_name()`` and ``set_version()`` methods. `#6214 <https://github.com/conan-io/conan/pull/6214>`_


1.21.3 (03-Mar-2020)
--------------------

- Bugfix: Fixing locking system for metadata file so it can be accessed concurrently. `#6543 <https://github.com/conan-io/conan/pull/6543>`_
- Bugfix: Manage the dirty state of the cache package folder with conan export-pkg. `#6517 <https://github.com/conan-io/conan/pull/6517>`_
- Bugfix: BugFix: Add quotes to virtualenv scripts, so they don't crash in pure sh shells. `#6516 <https://github.com/conan-io/conan/pull/6516>`_
- Bugfix: Upload was silently skipping exceptions, which could result in packages not uploaded, but user not realizing about the error. `#6515 <https://github.com/conan-io/conan/pull/6515>`_
- BugFix: Add ``system_libs`` to ``premake`` generator. `#6496 <https://github.com/conan-io/conan/pull/6496>`_


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

Expand Down