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/08/18 01:39:22 UTC

[celix] branch master updated (4c24ebfc -> db99d918)

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 4c24ebfc Merge pull request #605 from apache/feature/allow_duplicate_bundles_in_container
     add fc022b39 Add project-specific prefix to REL_INSTALL_DIR to avoid conflict with downstream project's config file.
     new db99d918 Merge pull request #617 from apache/hotfix/avoid-config-conflict

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:
 cmake/CelixConfig.cmake                       | 26 +++++++++++++-------------
 documents/bundles.md                          | 10 +++++-----
 libs/promises/cmake/CelixPromisesConfig.cmake | 10 +++++-----
 3 files changed, 23 insertions(+), 23 deletions(-)


[celix] 01/01: Merge pull request #617 from apache/hotfix/avoid-config-conflict

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 db99d918c9533aa7168cded832aa43b421efe060
Merge: 4c24ebfc fc022b39
Author: PengZheng <ho...@gmail.com>
AuthorDate: Fri Aug 18 09:39:16 2023 +0800

    Merge pull request #617 from apache/hotfix/avoid-config-conflict
    
    hotfix/Add project prefix to avoid conflict

 cmake/CelixConfig.cmake                       | 26 +++++++++++++-------------
 documents/bundles.md                          | 10 +++++-----
 libs/promises/cmake/CelixPromisesConfig.cmake | 10 +++++-----
 3 files changed, 23 insertions(+), 23 deletions(-)