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

Posted to commits@felix.apache.org by tj...@apache.org on 2020/11/05 15:56:29 UTC

[felix-dev] 06/06: Merge branch 'master' into scrR8

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

tjwatson pushed a commit to branch scrR8
in repository https://gitbox.apache.org/repos/asf/felix-dev.git

commit 44c33f33356d5c25eb050ae0c518eb39b9bc863f
Merge: ce11b7a d9236c8
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Thu Nov 5 09:55:06 2020 -0600

    Merge branch 'master' into scrR8

 configadmin/changelog.txt                          |   8 ++
 .../apache/felix/cm/file/ConfigurationHandler.java |  56 ++++-----
 .../felix/cm/file/FilePersistenceManager.java      |  26 ++---
 .../apache/felix/cm/impl/ConfigurationManager.java |   9 +-
 .../felix/cm/file/ConfigurationHandlerTest.java    |  32 +++++-
 .../inject/internal/ComponentConstructorImpl.java  |   6 +-
 .../impl/manager/RegionConfigurationSupport.java   |   9 +-
 .../scr/integration/ComponentConstructorTest.java  | 128 ++++++++++++++++++++-
 .../components/ConstructorComponent.java           |   2 +-
 .../resources/integration_test_constructor.xml     |  45 +++++++-
 10 files changed, 263 insertions(+), 58 deletions(-)