tree cce9ad29c707a0136cbcf1a5a4846df487b7d08d
parent 730fb807e5f5ceb814ac309e719e66c802d06ce7
parent a46976c56516590947c89dd1f9840a5ee1e950f7
author Marco Miller <marco.miller@ericsson.com> 1549487946 -0500
committer Marco Miller <marco.miller@ericsson.com> 1549487946 -0500

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  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: I58e9a3f87850d78405f53d052cfeb6cce3cba196