tree 88402a0ff62817af91ac74edcf03405f6502be96
parent c24e3c4e59523b92c94fd02e9213cd39a803af0f
parent ce0c9c1f711f9ea5e17deef0bf08dcac0996c0b0
author Marco Miller <marco.miller@ericsson.com> 1553090781 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553091419 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I2e44de3f946dbc7f9c65516e3d5571bafd77dab6