tree 6d58393a0a1cf980667d6891cc71fa6778d21f0a
parent def9149c3dec77c852b5e65689a9eff5b206c5e8
parent 45f2d92e596d3ac7398a2f318a709918f9bea2eb
author Marco Miller <marco.miller@ericsson.com> 1553090774 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553091406 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I225c36714cf5ccc0106a6f66f994362cee5e85de