tree d69daa5f8812ecae2b34b509a8572bdc84564e52
parent a221693674e3bd03e5ee371cca0ad1f0f4f0bf13
parent 31929937c89740df72ed924c6a80d4bd69bbb92f
author Marco Miller <marco.miller@ericsson.com> 1549488240 -0500
committer Marco Miller <marco.miller@ericsson.com> 1549488270 -0500

Merge branch 'stable-2.16'

* stable-2.16:
  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: Iaf29df102ab4c3695970f6fcabbceb1e3d09cb02