tree 9f7951a58d14bd94b7acd1c8582f2bf29b52ea6d
parent 7f46a10b0bdac9035cdd513b9fa50ea54fb17972
parent 06429fc1a3d9319471ec441a696987f66dabd1c4
author Marco Miller <marco.miller@ericsson.com> 1553090778 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553091413 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I1fe75ddeee653e2d55fa26ed3929433a702e2ad6