tree b47ec7483c7f3c5c866b76ab94831173f9e12fb1
parent e9fb68ce30f1b72f18f841678e3f7d2278524bba
parent 2049399f7f2516101d92553af38a83003f99c229
author Marco Miller <marco.miller@ericsson.com> 1549417420 -0500
committer Marco Miller <marco.miller@ericsson.com> 1549417420 -0500

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Forwarder tests: Replace null event json with valid one
  Add .apt_generated directory to .gitignore
  Update mockito-core to 2.24.0
  RestForwarderServletModuleIT: Add a cache wildcard endpoint test
  RestForwarderServletModule: Add missing wildcard to event endpoint

Change-Id: I60e2399e9ac00cf56f54c7e5d17544bfadea87d6