commit | 000da9352b185a4d2f175ba11874b67ede0aebba | [log] [tgz] |
---|---|---|
author | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 12:10:31 2019 -0400 |
committer | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 12:15:51 2019 -0400 |
tree | 7125c4b4ae61000e169ecb98bd2851062a02e7f1 | |
parent | cb804145fbd58f537ac1c29295ba90d67f39d662 [diff] | |
parent | f3e4583ef5ae0cb9ced2d895ad9512396ce3c203 [diff] |
Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Extend ServletModule instead of HttpPluginModule Change-Id: Iaedd17246e07b9b57e742a19f7de836e374c85a2