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

Posted to commits@commons.apache.org by tv...@apache.org on 2021/02/15 21:24:09 UTC

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

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 bf826a310f55ca0854117653440c84ec0c1773f6
Merge: f889064 24f9cd6
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Mon Feb 15 22:23:37 2021 +0100

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

 .../commons/jcs3/access/exception/InvalidHandleException.java     | 2 +-
 .../commons/jcs3/auxiliary/disk/block/BlockDiskKeyStore.java      | 2 +-
 .../apache/commons/jcs3/auxiliary/disk/indexed/IndexedDisk.java   | 4 ++--
 .../main/java/org/apache/commons/jcs3/utils/net/HostNameUtil.java | 2 +-
 .../java/org/apache/commons/jcs3/jcache/JCSConfiguration.java     | 2 +-
 .../org/apache/commons/jcs3/jcache/cdi/CachePutInterceptor.java   | 2 +-
 .../apache/commons/jcs3/jcache/cdi/CacheRemoveAllInterceptor.java | 2 +-
 .../apache/commons/jcs3/jcache/cdi/CacheRemoveInterceptor.java    | 2 +-
 .../apache/commons/jcs3/jcache/cdi/CacheResultInterceptor.java    | 2 +-
 .../org/apache/commons/jcs3/jcache/cdi/GeneratedCacheKeyImpl.java | 2 +-
 .../commons/jcs3/jcache/cdi/MakeJCacheCDIInterceptorFriendly.java | 4 ++--
 .../org/apache/commons/jcs3/jcache/lang/Lang3Substitutor.java     | 2 +-
 .../src/test/java/org/apache/commons/jcs3/jcache/CacheTest.java   | 8 ++++----
 .../java/org/apache/commons/jcs3/jcache/ExpiryListenerTest.java   | 2 +-
 14 files changed, 19 insertions(+), 19 deletions(-)