Skip to content

Commit

Permalink
Merge master to develop 1.24.0 (conan-io#1642)
Browse files Browse the repository at this point in the history
* fix dupe changelog (conan-io#1617)

Co-authored-by: Daniel <[email protected]>

* Convert all references to lowercase (conan-io#1619)

* Convert all references to lowercase

* fix

* Update developing_packages/workspaces.rst

* Update developing_packages/workspaces.rst

* Update howtos/manage_shared_libraries/env_vars.rst

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <[email protected]>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <[email protected]>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <[email protected]>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <[email protected]>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <[email protected]>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <[email protected]>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <[email protected]>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <[email protected]>

* Update devtools/build_requires.rst

Co-Authored-By: Javier G. Sogo <[email protected]>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <[email protected]>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <[email protected]>

Co-authored-by: Javier G. Sogo <[email protected]>

* Remove linkcheck from master jobs (conan-io#1633)

* Remove old stuff from building scripts: elasticsearch, old deploy commands (conan-io#1634)

* Remove linkcheck from master jobs

* remove indexing stuff from deploy script

* remove old gh_pages script

* remove nginx script

* remove make_mac

* remove elastic stuff

Co-authored-by: Javier G. Sogo <[email protected]>

* conan-io#1506 Add Troubleshooting for duplicated package (conan-io#1507)

* conan-io#1506 Add Troubleshooting for duplicated package

Signed-off-by: Uilian Ries <[email protected]>

* conan-io#1506 Better block format

Signed-off-by: Uilian Ries <[email protected]>

* conan-io#1506 Better block format

Signed-off-by: Uilian Ries <[email protected]>

* Change the perspective to transitive package

Signed-off-by: Uilian Ries <[email protected]>

Co-authored-by: Javier G. Sogo <[email protected]>

* Use the build folder to apply any patch (conan-io#1605)

* Use the build folder to apply any patch

Some motivation: conan-io/conan-center-index#1107 (comment)

Signed-off-by: Uilian Ries <[email protected]>

* Update build folder comment

Signed-off-by: Uilian Ries <[email protected]>

* Update reference/tools.rst

Co-authored-by: Javier G. Sogo <[email protected]>
Co-authored-by: Daniel <[email protected]>

* Remove redundant text in visualstudio.rst (conan-io#1625)

Co-authored-by: Javier G. Sogo <[email protected]>

* Add information about matrix-params in the artifacts.properties reference (conan-io#1487)

* add matrix-params to docs

* finally landed in 7.3.2

* Update reference/config_files/artifacts.properties.rst

Co-Authored-By: Carlos Zoido <[email protected]>

Co-authored-by: Carlos Zoido <[email protected]>

Co-authored-by: Daniel <[email protected]>
Co-authored-by: Javier G. Sogo <[email protected]>
Co-authored-by: Uilian Ries <[email protected]>
Co-authored-by: syntroniks <[email protected]>
  • Loading branch information
5 people authored Mar 31, 2020
1 parent 29e0519 commit 9694fba
Show file tree
Hide file tree
Showing 63 changed files with 452 additions and 731 deletions.
114 changes: 0 additions & 114 deletions _elastic/indexer.py

This file was deleted.

34 changes: 0 additions & 34 deletions _elastic/query_examples/index.txt

This file was deleted.

45 changes: 0 additions & 45 deletions _elastic/query_examples/insert_example.txt

This file was deleted.

38 changes: 0 additions & 38 deletions _elastic/query_examples/query.txt

This file was deleted.

4 changes: 2 additions & 2 deletions changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ Check https://github.com/conan-io/conan for issues and more details about develo
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>`_
- Bugfix: Fixed crashing of recipes using both ``python_requires`` and ``build_id()``. `#6618 <https://github.com/conan-io/conan/pull/6618>`_
- Bugfix: Conan should not append generator_platform to the Visual Studio generator if it is already specified by the user. `#6549 <https://github.com/conan-io/conan/pull/6549>`_

1.22.2 (13-Feb-2020)
--------------------
Expand Down
Loading

0 comments on commit 9694fba

Please sign in to comment.