| commit | c9fa8862bc579307ec4fc54315c56a472c96a550 | [log] [tgz] |
|---|---|---|
| author | Richard Zowalla <rzo1@apache.org> | Thu Jan 18 10:10:40 2024 +0100 |
| committer | Richard Zowalla <rzo1@apache.org> | Thu Jan 18 10:10:40 2024 +0100 |
| tree | ad07bee9ef9a20e62891178cbe9a0d43db30a1ae | |
| parent | 0289e7c3389d71efdbb0b0053c1cc13f501a3eb5 [diff] | |
| parent | 035d38623b3455a54b09ca5c33b9aa872d16abaa [diff] |
Merge remote-tracking branch 'origin/main' into concurrency-work # Conflicts: # container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java