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:24 UTC

[felix-dev] 01/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 6afbad63ccfd8859ee59c1ec254b407db636db91
Merge: 35c51c7 ecad95c
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Thu Oct 22 14:24:58 2020 -0500

    Merge branch 'master' into scrR8

 gogo/bom/pom.xml                                   |  4 +-
 gogo/jline/doc/changelog.txt                       |  5 ++
 gogo/jline/pom.xml                                 |  2 +-
 .../hc/core/impl/executor/HealthCheckFuture.java   |  7 ++-
 .../felix/scr/impl/manager/DependencyManager.java  | 55 +++++++++++++---------
 5 files changed, 44 insertions(+), 29 deletions(-)