[celix] branch master updated (d8b1f336 -> d1bda67d)

[pe...@apache.org]

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 d8b1f336 Merge pull request #439 from apache/feature/add_new_conan_option
     add db8b2f0e Add conan option for bundle compression.
     new d1bda67d Merge pull request #440 from apache/feature/bundle_compression_option

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/cmake_celix/BundlePackaging.cmake | 11 +++++++++--
 conanfile.py                            |  6 ++----
 2 files changed, 11 insertions(+), 6 deletions(-)

[celix] 01/01: Merge pull request #440 from apache/feature/bundle_compression_option

[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 d1bda67df100a69272b6be3fd8c7d13015e50cc5
Merge: d8b1f336 db8b2f0e
Author: PengZheng <ho...@gmail.com>
AuthorDate: Wed Sep 7 10:04:45 2022 +0800

    Merge pull request #440 from apache/feature/bundle_compression_option
    
    Add conan option for bundle compression.

 cmake/cmake_celix/BundlePackaging.cmake | 11 +++++++++--
 conanfile.py                            |  6 ++----
 2 files changed, 11 insertions(+), 6 deletions(-)