Console Output

+ git merge --ff appng-manager-1.19.x --strategy-option theirs
Auto-merging src/main/java/org/appng/application/manager/business/Cache.java
Merge made by the 'recursive' strategy.
 application-home/conf/datasources/ds-sites.xml     |   2 +-
 application-home/conf/events/ev-sites.xml          |   4 +-
 application-home/conf/pages/pg-sites.xml           |   2 +-
 pom.xml                                            |   4 +-
 .../appng/application/manager/business/Cache.java  | 170 ++++----
 .../application/manager/business/Sessions.java     |  70 ++--
 .../appng/application/manager/business/Sites.java  |   7 +-
 .../manager/service/ManagerService.java            |  15 +-
 .../appng/application/manager/service/Service.java |   3 +-
 .../application/manager/business/CacheTest.java    |   9 +
 .../resources/xml/CacheTest-testCacheNoSite.xml    |  68 ++++
 src/test/resources/xml/SitesTest-testShowSites.xml | 430 ++++++++++-----------
 .../xml/SitesTest-testShowSitesFiltered.xml        | 330 ++++++++--------
 13 files changed, 604 insertions(+), 510 deletions(-)
 create mode 100644 src/test/resources/xml/CacheTest-testCacheNoSite.xml