You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@celix.apache.org by pe...@apache.org on 2023/02/22 11:23:27 UTC

[celix] branch master updated (5d9beec9 -> 848253a6)

This is an automated email from the ASF dual-hosted git repository.

pengzheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git


    from 5d9beec9 Merge pull request #478 from apache/feature/remove_dfi_dep
     add e5ec4ab7 Stick to Conan 1.59.0.
     add 6f6681b4 Merge branch 'master' into hotfix/conan_build
     new 848253a6 Merge pull request #484 from apache/hotfix/conan_build

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/coverage.yml | 2 +-
 .github/workflows/macos.yml    | 2 +-
 .github/workflows/ubuntu.yml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

[celix] 01/01: Merge pull request #484 from apache/hotfix/conan_build

Posted by pe...@apache.org.

This is an automated email from the ASF dual-hosted git repository.

pengzheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git

commit 848253a63adc79a9a6e90fd6c90beef96c8031f9
Merge: 5d9beec9 6f6681b4
Author: PengZheng <ho...@gmail.com>
AuthorDate: Wed Feb 22 19:23:22 2023 +0800

    Merge pull request #484 from apache/hotfix/conan_build
    
    Hotfix/conan build

 .github/workflows/coverage.yml | 2 +-
 .github/workflows/macos.yml    | 2 +-
 .github/workflows/ubuntu.yml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)