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 11:45:35 UTC
[sling-whiteboard] 05/05: 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 0e5508c4f0b7907efc4c3e82574031af3091d9be
Merge: 1967a95 34da23e
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Tue Jun 18 13:29:32 2019 +0200
Merge branch 'master' of github.com:apache/sling-whiteboard
url-connection-agent/README.md | 14 ++--
url-connection-agent/pom.xml | 5 +-
.../main/java/org/apache/sling/uca/impl/Agent.java | 28 ++++++--
.../java/org/apache/sling/uca/impl/AgentInfo.java | 77 ++++++++++++++++++++++
...TimeoutTransformer.java => AgentInfoMBean.java} | 42 ++++++++----
.../uca/impl/HttpClient3TimeoutTransformer.java | 51 ++++++--------
.../uca/impl/HttpClient4TimeoutTransformer.java | 6 +-
.../sling/uca/impl/JavaNetTimeoutTransformer.java | 51 ++++----------
.../uca/impl/MBeanAwareTimeoutTransformer.java | 75 +++++++++++++++++++++
.../sling/uca/impl/OkHttpTimeoutTransformer.java | 4 +-
...pdateFieldsInConstructorTimeoutTransformer.java | 52 ++++++---------
.../uca/impl/JaveNetTimeoutTransformerTest.java | 51 --------------
12 files changed, 269 insertions(+), 187 deletions(-)