[felix-dev] branch master updated (425655e -> 945008d)

[pa...@apache.org]

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

pauls pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git.


    from 425655e  Merge pull request #66 from apache/issues/FELIX-6294
     add 2e18682  FELIX-6163: do not use System.currentTimeMillis() to check timeouts
     new 945008d  Merge pull request #67 from apache/issues/FELIX-6163

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:
 .../src/main/java/org/apache/felix/framework/util/ThreadGate.java   | 6 ++++--
 framework/src/main/java/org/osgi/util/tracker/ServiceTracker.java   | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

[felix-dev] 01/01: Merge pull request #67 from apache/issues/FELIX-6163

[pa...@apache.org]

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

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

commit 945008d53f05eb378481a63ff654cccf7a01d7be
Merge: 425655e 2e18682
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Tue Dec 15 23:53:23 2020 +0100

    Merge pull request #67 from apache/issues/FELIX-6163
    
    FELIX-6163: do not use System.currentTimeMillis() to check timeouts

 .../src/main/java/org/apache/felix/framework/util/ThreadGate.java   | 6 ++++--
 framework/src/main/java/org/osgi/util/tracker/ServiceTracker.java   | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)