commit | cce0ccb31ccd49dd2c7c36bdc3a85fb744ce7b68 | [log] [tgz] |
---|---|---|
author | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 10:06:14 2019 -0400 |
committer | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 10:16:46 2019 -0400 |
tree | 6d58393a0a1cf980667d6891cc71fa6778d21f0a | |
parent | def9149c3dec77c852b5e65689a9eff5b206c5e8 [diff] | |
parent | 45f2d92e596d3ac7398a2f318a709918f9bea2eb [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Extend ServletModule instead of HttpPluginModule Change-Id: I225c36714cf5ccc0106a6f66f994362cee5e85de