commit | d06d3bf65c4bc5866e13ecf87b9455f2d3b3c27f | [log] [tgz] |
---|---|---|
author | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 10:06:22 2019 -0400 |
committer | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 10:17:02 2019 -0400 |
tree | a2d2ac73f7ef836246015c4207fd2229c6e21453 | |
parent | b9816a9504a3ed5a11b66e1f5ffb4e75c44cd223 [diff] | |
parent | 4507e51f49bc321c7923110039e14ca21f14ff49 [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Extend ServletModule instead of HttpPluginModule Change-Id: Iabad02caeb6e4763652b4a6f5731ca09d3d1ec5e