Merge pull request #1701 from czoido/merge_master_1.25.1_to_develop

Merge master 1.25.1 to develop
conan-io · May 14, 2020 · 4209098 · 4209098
2 parents d4fe0a5 + 7a4ce7e
commit 4209098
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/changelog.rst b/changelog.rst
@@ -21,6 +21,16 @@ Check https://github.com/conan-io/conan for issues and more details about develo
     Conan 1.25 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.25.1 (13-May-2020)
+--------------------
+
+- Feature: Add missing gcc versions: 6.5, 7.5, 8.4, 10.1. `#6993 <https://github.com/conan-io/conan/pull/6993>`_ . Docs `here <https://github.com/conan-io/docs/pull/1689>`__
+- Bugfix: Resumable download introduced a bug when there is a fronted (like Apache) to Artifactory or other server that gzips the returned files, returning an incorrect ``Content-Length`` header that doesn't match the real content length. `#6996 <https://github.com/conan-io/conan/pull/6996>`_
+- Bugfix: Fix deploy generator in regards to relative symlinks. `#6994 <https://github.com/conan-io/conan/pull/6994>`_
+- Bugfix: Set ``shared_linker_flags`` to CMake ``MODULE`` targets too in ``cmake`` generators, not only to ``SHARED_LIBRARIES``. `#6983 <https://github.com/conan-io/conan/pull/6983>`_
+- Bugfix: Fix `conan_get_policy` return value. `#6982 <https://github.com/conan-io/conan/pull/6982>`_
+- Bugfix: Fix json output serialization for ``cpp_info.components``. `#6966 <https://github.com/conan-io/conan/pull/6966>`_
+
 1.25.0 (06-May-2020)
 --------------------
 

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

diff --git a/reference/config_files/settings.yml.rst b/reference/config_files/settings.yml.rst
@@ -56,11 +56,11 @@ are possible. These are the **default** values, but it is possible to customize
         gcc: &gcc
             version: ["4.1", "4.4", "4.5", "4.6", "4.7", "4.8", "4.9",
                       "5", "5.1", "5.2", "5.3", "5.4", "5.5",
-                      "6", "6.1", "6.2", "6.3", "6.4",
-                      "7", "7.1", "7.2", "7.3", "7.4",
-                      "8", "8.1", "8.2", "8.3",
+                      "6", "6.1", "6.2", "6.3", "6.4", "6.5",
+                      "7", "7.1", "7.2", "7.3", "7.4", "7.5",
+                      "8", "8.1", "8.2", "8.3", "8.4",
                       "9", "9.1", "9.2", "9.3",
-                      "10"]
+                      "10", "10.1"]
             libcxx: [libstdc++, libstdc++11]
             threads: [None, posix, win32] #  Windows MinGW
             exception: [None, dwarf2, sjlj, seh] # Windows MinGW