commit | f3e4583ef5ae0cb9ced2d895ad9512396ce3c203 | [log] [tgz] |
---|---|---|
author | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 10:06:18 2019 -0400 |
committer | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 10:16:53 2019 -0400 |
tree | 9f7951a58d14bd94b7acd1c8582f2bf29b52ea6d | |
parent | 7f46a10b0bdac9035cdd513b9fa50ea54fb17972 [diff] | |
parent | 06429fc1a3d9319471ec441a696987f66dabd1c4 [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Extend ServletModule instead of HttpPluginModule Change-Id: I1fe75ddeee653e2d55fa26ed3929433a702e2ad6