Commits on Mar 30, 2021

1. Update lockfile bundle docs for 1.34.1 (conan-io#2040) …

   * Update lockfile bundle docs for 1.34.1
   
   * Remove erroneous colon
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

   

   solvingj and czoido committed Mar 30, 2021
   Copy the full SHA

   71022d6 View commit details

   Browse the repository at this point in the history

2. Release/1.35.0 (conan-io#2063) …

   * buildroot.rst: Fix a typo (conan-io#1996)
   
   Artifatory --> Artifactory
   
   * - meson : add target argument (conan-io#2011)
   
   Signed-off-by: SSE4 <tomskside@gmail.com>
   
   * Update develop with master (conan-io#2020)
   
   * fix lowercase package names (conan-io#2013)
   
   * remove training banner (conan-io#2015)
   
   * Fix incorrect indentation in define_abi_compatibility.rst (conan-io#2017)
   
   * Fix spelling (conan-io#2018)
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   Co-authored-by: James <james@conan.io>
   Co-authored-by: chausner <chausner@users.noreply.github.com>
   
   * Fix multiple minor spelling mistakes (conan-io#2019)
   
   * fix lowercase package names (conan-io#2013)
   
   * remove training banner (conan-io#2015)
   
   * Fix multiple minor spelling mistakes
   
   * Fix incorrect indentation in define_abi_compatibility.rst (conan-io#2017)
   
   * Fix spelling (conan-io#2018)
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   Co-authored-by: James <james@conan.io>
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Rename QbsToolchain to QbsProfile (conan-io#2027)
   
   * Rename QbsToolchain to QbsProfile
   
   * Rename use_profile to profile
   
   * conan_v2_error update (conan-io#2031)
   
   * lock bundle (conan-io#2030)
   
   * lock bundle
   
   * Update versioning/lockfiles/bundle.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update versioning/lockfiles/bundle.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update versioning/lockfiles/bundle.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update versioning/lockfiles/bundle.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update versioning/lockfiles/bundle.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Merge master to develop (conan-io#2033)
   
   * fix lowercase package names (conan-io#2013)
   
   * remove training banner (conan-io#2015)
   
   * Fix incorrect indentation in define_abi_compatibility.rst (conan-io#2017)
   
   * Fix spelling (conan-io#2018)
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Remove misleading message about ConanCenter in shared_library_package_id() (conan-io#2000)
   
   * Update yocto docs (conan-io#2022)
   
   * Troubleshooting: How to fix incompatible requirements (conan-io#2016)
   
   * How to solve incompatible requirements
   
   Signed-off-by: Uilian Ries <uilianries@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   * Fix bad indentation
   
   Signed-off-by: Uilian Ries <uilianries@gmail.com>
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   Co-authored-by: James <james@conan.io>
   Co-authored-by: chausner <chausner@users.noreply.github.com>
   Co-authored-by: Daniel <danimanzaneque@gmail.com>
   Co-authored-by: Uilian Ries <uilianries@gmail.com>
   
   * Merge master to develop (conan-io#2036)
   
   * fix lowercase package names (conan-io#2013)
   
   * remove training banner (conan-io#2015)
   
   * Fix incorrect indentation in define_abi_compatibility.rst (conan-io#2017)
   
   * Fix spelling (conan-io#2018)
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Remove misleading message about ConanCenter in shared_library_package_id() (conan-io#2000)
   
   * Update yocto docs (conan-io#2022)
   
   * Troubleshooting: How to fix incompatible requirements (conan-io#2016)
   
   * How to solve incompatible requirements
   
   Signed-off-by: Uilian Ries <uilianries@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   * Fix bad indentation
   
   Signed-off-by: Uilian Ries <uilianries@gmail.com>
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Release 1.34.0 (conan-io#2035)
   
   * buildroot.rst: Fix a typo (conan-io#1996)
   
   Artifatory --> Artifactory
   
   * - meson : add target argument (conan-io#2011)
   
   Signed-off-by: SSE4 <tomskside@gmail.com>
   
   * Update develop with master (conan-io#2020)
   
   * fix lowercase package names (conan-io#2013)
   
   * remove training banner (conan-io#2015)
   
   * Fix incorrect indentation in define_abi_compatibility.rst (conan-io#2017)
   
   * Fix spelling (conan-io#2018)
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   Co-authored-by: James <james@conan.io>
   Co-authored-by: chausner <chausner@users.noreply.github.com>
   
   * Fix multiple minor spelling mistakes (conan-io#2019)
   
   * fix lowercase package names (conan-io#2013)
   
   * remove training banner (conan-io#2015)
   
   * Fix multiple minor spelling mistakes
   
   * Fix incorrect indentation in define_abi_compatibility.rst (conan-io#2017)
   
   * Fix spelling (conan-io#2018)
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   Co-authored-by: James <james@conan.io>
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Rename QbsToolchain to QbsProfile (conan-io#2027)
   
   * Rename QbsToolchain to QbsProfile
   
   * Rename use_profile to profile
   
   * conan_v2_error update (conan-io#2031)
   
   * lock bundle (conan-io#2030)
   
   * lock bundle
   
   * Update versioning/lockfiles/bundle.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update versioning/lockfiles/bundle.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update versioning/lockfiles/bundle.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update versioning/lockfiles/bundle.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update versioning/lockfiles/bundle.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * release 1.34.0
   
   * fix changelog
   
   * Merge master to release branch (conan-io#2034)
   
   * fix lowercase package names (conan-io#2013)
   
   * remove training banner (conan-io#2015)
   
   * Fix incorrect indentation in define_abi_compatibility.rst (conan-io#2017)
   
   * Fix spelling (conan-io#2018)
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Remove misleading message about ConanCenter in shared_library_package_id() (conan-io#2000)
   
   * Update yocto docs (conan-io#2022)
   
   * Troubleshooting: How to fix incompatible requirements (conan-io#2016)
   
   * How to solve incompatible requirements
   
   Signed-off-by: Uilian Ries <uilianries@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * Update faq/troubleshooting.rst
   
   * Fix bad indentation
   
   Signed-off-by: Uilian Ries <uilianries@gmail.com>
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   Co-authored-by: James <james@conan.io>
   Co-authored-by: chausner <chausner@users.noreply.github.com>
   Co-authored-by: Daniel <danimanzaneque@gmail.com>
   Co-authored-by: Uilian Ries <uilianries@gmail.com>
   
   Co-authored-by: rico-chet <rico-chet@users.noreply.github.com>
   Co-authored-by: SSE4 <tomskside@gmail.com>
   Co-authored-by: James <james@conan.io>
   Co-authored-by: chausner <chausner@users.noreply.github.com>
   Co-authored-by: Psy-Kai <psykai1993@googlemail.com>
   Co-authored-by: Daniel <danimanzaneque@gmail.com>
   Co-authored-by: Uilian Ries <uilianries@gmail.com>
   
   Co-authored-by: James <james@conan.io>
   Co-authored-by: chausner <chausner@users.noreply.github.com>
   Co-authored-by: Daniel <danimanzaneque@gmail.com>
   Co-authored-by: Uilian Ries <uilianries@gmail.com>
   Co-authored-by: rico-chet <rico-chet@users.noreply.github.com>
   Co-authored-by: SSE4 <tomskside@gmail.com>
   Co-authored-by: Psy-Kai <psykai1993@googlemail.com>
   
   * update constrained settings example error message (conan-io#2032)
   
   * Make the instructions in the note about gcc libcxx ABI compatibility more explicit. (conan-io#2037)
   
   * More explicit instructions on the Getting Started page
   * Provide a command to check gccs default configuration value on the Manage gcc >= 5 ABI page.
   
   * - document custom template definitions (conan-io#2051)
   
   Signed-off-by: SSE4 <tomskside@gmail.com>
   
   * Docs for lockfiles features from 1.35 (conan-io#2053)
   
   * modify command reference
   
   * update lock reference
   
   * wip
   
   * document clean-modified for lockfiles
   
   * update bundle docs
   
   * document conan lock install
   
   * Docs for automatically handle CONAN_RUN_TESTS environment variable (conan-io#2056)
   
   * wip
   
   * wip
   
   * update bh docs
   
   * Add docs for CMAKE_SH and data in cmakedeps (conan-io#2055)
   
   * Add docs for CMAKE_SH and data in cmakedeps
   
   * remove note box
   
   * Update lockfile bundle docs for 1.34.1 (conan-io#2040) (conan-io#2058)
   
   * Update lockfile bundle docs for 1.34.1
   
   * Remove erroneous colon
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   Co-authored-by: Jerry Wiltse <jerrywiltse@gmail.com>
   
   * update cconf (conan-io#2059)
   
   * add confs (conan-io#2061)
   
   * docs for new msbuilddeps transitivity (conan-io#2052)
   
   * docs for new msbuilddeps transitivity
   
   * fix ci
   
   Co-authored-by: czoido <mrgalleta@gmail.com>
   
   * add docs for patches (conan-io#2062)
   
   * autotools docs (conan-io#2057)
   
   * autotools docs
   
   * add marker
   
   Co-authored-by: czoido <mrgalleta@gmail.com>
   
   * Feature/tools virtualenv (conan-io#2060)
   
   * add virtualenv and environment docs
   
   * removing env from .gitignore
   
   * fix contents
   
   Co-authored-by: czoido <mrgalleta@gmail.com>
   
   * [conf] to define vs version for msvc (conan-io#2054)
   
   * [conf] to define vs version for msvc
   
   * notes about ``conanvcvars.bat`` file creation
   
   * fix ci
   
   * Update reference/config_files/settings.yml.rst
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * add to conf
   
   Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
   
   * version 1.35.0
   
   * update changelog
   
   Co-authored-by: rico-chet <rico-chet@users.noreply.github.com>
   Co-authored-by: SSE4 <tomskside@gmail.com>
   Co-authored-by: James <james@conan.io>
   Co-authored-by: chausner <chausner@users.noreply.github.com>
   Co-authored-by: Psy-Kai <psykai1993@googlemail.com>
   Co-authored-by: Daniel <danimanzaneque@gmail.com>
   Co-authored-by: Uilian Ries <uilianries@gmail.com>
   Co-authored-by: melak47 <melak47@users.noreply.github.com>
   Co-authored-by: jsinge <jonsinge@freenet.de>
   Co-authored-by: Jerry Wiltse <jerrywiltse@gmail.com>

   

   

   11 people committed Mar 30, 2021
   Copy the full SHA

   7398981 View commit details

   Browse the repository at this point in the history

3. Merge branch 'master' into merge_master_develop_1_35_0

   

   czoido committed Mar 30, 2021
   Copy the full SHA

   a716c1d View commit details

   Browse the repository at this point in the history