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

Posted to commits@directory.apache.org by el...@apache.org on 2019/01/08 13:33:31 UTC

[directory-server] 02/03: Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-server

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

elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git

commit 08b0c2e5da0d4ca4d1d05f18b7c382305ef189ff
Merge: 298ae23 598558b
Author: Emmanuel Lecharny <el...@apache.org>
AuthorDate: Mon Jan 7 10:05:04 2019 +0100

    Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-server

 core-api/pom.xml                                   | 11 ++---
 .../directory/server/core/api/CacheService.java    | 10 ++---
 installers/src/test/docker/run-tests.sh            | 24 +++++------
 .../osgi/integ/ServerCoreAnnotationsOsgiTest.java  | 48 ++++++++++++++++++++++
 pom.xml                                            |  3 +-
 5 files changed, 71 insertions(+), 25 deletions(-)