tree b9a8e0ea2789755a80024a0b52e3363a2802175b
parent 0d01796298bb2725769bd5469aa3b7931ee9dfe1
parent f8def5cc02ed37521dffe1a04460f7cbf2983c8d
author David Pursehouse <dpursehouse@collab.net> 1556092601 +0900
committer David Pursehouse <dpursehouse@collab.net> 1556092601 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Document that cache cleaning intervals < 1h are not supported
  Apply changes to file-based websession cache from HA-plugin
  Update cache cleaner to HA-plugin version and add tests
  Add additional tests for websession cash from HA-plugin
  Refactor test key assignment in cache tests
  Use junit to provide a temporary directory for testing
  Simplify cache-directory creation
  Adapt system time manipulation to method used in HA-plugin
  Reformat code with google-java-format 1.7
  Fix getIfPresentObjectNonStringTest

Change-Id: I93edd692e06c6713a6f991f002582735179fafea