Merge branch 'master' into feature/list_all_bundles 386/head
authorPepijn Noltes <pnoltes@apache.org>
Tue, 8 Feb 2022 11:02:42 +0000 (12:02 +0100)
committerPepijn Noltes <pnoltes@apache.org>
Tue, 8 Feb 2022 11:02:42 +0000 (12:02 +0100)
commit5ee5a2d9e39be618eea0d589e157439982280e3b
tree61030cb064424594b91cac3b5ded2d05e572aad1
parentf40fd7ec60dd9dce678dc9fa5a18387a0e06f5e9
parent0fce5e69de41a4822a1745bfb6da14b9dc5b5831
Merge branch 'master' into feature/list_all_bundles

# Conflicts:
# libs/framework/gtest/src/CxxBundleContextTestSuite.cc
libs/framework/gtest/CMakeLists.txt
libs/framework/gtest/src/CxxBundleContextTestSuite.cc
libs/framework/include/celix/BundleContext.h
libs/framework/src/bundle_context.c
libs/framework/src/framework.c