tree 2db72174efda199c1ab75f04d592d61c6fc1b190
parent 68fcb6a4b176fdc6d329aab5886423e582546d72
parent 577115b31ff7bf8e3c6cf2cd99ff21ae2cd1a5ed
author Marco Miller <marco.miller@ericsson.com> 1553098230 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553098548 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I4e1377275cb889389da465d1b6cd77975f3a5c6e