Feature/merge master (conan-io#1581)

* conan-io#1562 Update tools.download (conan-io#1563) * conan-io#1562 Update tools.download Signed-off-by: Uilian Ries <[email protected]> * conan-io#1562 Update tools.download default retry Signed-off-by: Uilian Ries <[email protected]> * fix links (conan-io#1570) * new conandays image * Fixed links and improved linkcheck (conan-io#1571) * Fixed redirected links * Increased timout, retries and workers for linkcheck * fix typo (conan-io#1569) Co-authored-by: carpanla <[email protected]> * fix typo (conan-io#1569) Co-authored-by: carpanla <[email protected]> * Merge 1.21.3 to master (conan-io#1574) * update version * change version * fix version * removed banner * Merge Release/1.22.3 to master (conan-io#1579) * update changelog * update version Co-authored-by: Uilian Ries <[email protected]> Co-authored-by: Javier G. Sogo <[email protected]> Co-authored-by: Daniel <[email protected]> Co-authored-by: carpanla <[email protected]> Co-authored-by: Carlos Zoido <[email protected]>
Dattax · Mar 6, 2020 · a4b6a4c · a4b6a4c
1 parent b274c47
commit a4b6a4c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/_themes/conan/layout.html b/_themes/conan/layout.html
@@ -158,7 +158,6 @@
           {% include "breadcrumbs.html" %}
           <!--<select id="search" name="state" multiple="true" onchange="window.location = reldir + this.value;" style="width:90%"></select>
           <hr/>-->
-          <a href="https://conandays.conan.io/"> <img src="{{ pathto('_static/conan-days-2020.png', 1) }}"/> </a><p/>
 
           <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
            <div itemprop="articleBody">

diff --git a/_themes/conan/static/conan-days-2020.png b/_themes/conan/static/conan-days-2020.png
diff --git a/changelog.rst b/changelog.rst
@@ -21,6 +21,12 @@ Check https://github.com/conan-io/conan for issues and more details about develo
     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.3 (05-Mar-2020)
+--------------------
+
+- Bugfix: Do not re-evaluate lockfiles nodes, only update the package reference, otherwise the build-requires are broken. `#6529 <https://github.com/conan-io/conan/pull/6529>`_
+- Bugfix: Fixing locking system for metadata file so it can be accessed concurrently. `#6524 <https://github.com/conan-io/conan/pull/6524>`_
+
 1.22.2 (13-Feb-2020)
 --------------------
 

diff --git a/conf.py b/conf.py
@@ -41,7 +41,7 @@
 # The short X.Y version.
 version = "1.22"
 # The full version, including alpha/beta/rc tags.
-release = u'1.22.2'
+release = u'1.22.3'
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 if not os.path.exists(os.path.join(dir_path, "versions.json")):