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

Posted to commits@sling.apache.org by si...@apache.org on 2019/06/18 21:42:29 UTC

[sling-whiteboard] 04/04: Merge branch 'master' of github.com:apache/sling-whiteboard

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

simonetripodi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git

commit c82ad0e49387322604f82b83f0967f009587723c
Merge: 7a07d7d a20fd43
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Tue Jun 18 23:42:14 2019 +0200

    Merge branch 'master' of github.com:apache/sling-whiteboard

 url-connection-agent/README.md                     |  12 +-
 .../java/org/apache/sling/uca/impl/AgentIT.java    | 185 ++++++++-------------
 .../org/apache/sling/uca/impl/AgentLauncher.java   | 107 ++++++++++++
 ...vingServerControl.java => ErrorDescriptor.java} |  26 +--
 .../apache/sling/uca/impl/HttpClientLauncher.java  |  83 ++++++---
 .../sling/uca/impl/MisbehavingServerControl.java   |  14 ++
 .../sling/uca/impl/MisbehavingServerExtension.java |  39 +++--
 ...ngServerControl.java => RecordedThrowable.java} |  29 ++--
 .../org/apache/sling/uca/impl/TestTimeouts.java    |  64 +++++++
 9 files changed, 383 insertions(+), 176 deletions(-)