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

tv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git

commit 3360e1a7d92f696b7dc7de3bba2d1f083467201f
Merge: df354d8 5e2237b
Author: Thomas Vandahl <t...@apache.org>
AuthorDate: Mon May 24 18:32:10 2021 +0200

    Merge branch 'master' of 
https://git-wip-us.apache.org/repos/asf/commons-jcs.git

 .github/workflows/maven.yml                             |  3 ++-
 CODE_OF_CONDUCT.md                                      | 17 +++++++++++++++++
 .../jcs3/auxiliary/disk/indexed/IndexedDiskCache.java   |  6 +++---
 .../auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java  |  2 +-
 .../jcs3/auxiliary/lateral/LateralCacheNoWait.java      |  2 +-
 .../jcs3/auxiliary/remote/RemoteCacheNoWait.java        |  2 +-
 .../auxiliary/remote/behavior/IRemoteCacheListener.java |  2 +-
 .../remote/http/client/RemoteHttpCacheAttributes.java   |  4 ++--
 .../remote/http/client/RemoteHttpCacheClient.java       |  2 +-
 .../commons/jcs3/engine/CacheEventQueueFactory.java     |  2 +-
 .../jcs3/engine/behavior/IShutdownObservable.java       |  2 +-
 .../jcs3/engine/control/CompositeCacheManager.java      |  4 +---
 .../org/apache/commons/jcs3/utils/access/JCSWorker.java |  6 +++---
 .../jcs3/utils/discovery/UDPDiscoveryManager.java       |  2 +-
 .../jcs3/utils/discovery/UDPDiscoverySenderThread.java  |  2 +-
 .../commons/jcs3/utils/struct/AbstractLRUMap.java       |  2 +-
 commons-jcs-dist/pom.xml                                |  2 +-
 src/changes/changes.xml                                 |  3 +++
 18 files changed, 42 insertions(+), 23 deletions(-)

Reply via email to