commit | 577115b31ff7bf8e3c6cf2cd99ff21ae2cd1a5ed | [log] [tgz] |
---|---|---|
author | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 10:06:15 2019 -0400 |
committer | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 10:16:49 2019 -0400 |
tree | 64893b4d25cb53abd8505b90768640e1b05e8dcf | |
parent | de4ea73673ba67cd58d55ae1110b11f019b8ee11 [diff] | |
parent | eb8024f017c61805161c3dff5b059b1cdb1aabb4 [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Extend ServletModule instead of HttpPluginModule Change-Id: Ib6a03e6f98bba3abf42df3d0c81d1ab882d8434e