Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
dev-plugins.txt: Recommend ServletModule instead of HttpPluginModule
AbandonUtil: Keep trying to abandon more changes despite single failure
Change-Id: I3ac9918e3ad8e51ef8ed54d4668cf5e4bf142555
diff --git a/Documentation/dev-plugins.txt b/Documentation/dev-plugins.txt
index 53b03b1..0198790 100644
--- a/Documentation/dev-plugins.txt
+++ b/Documentation/dev-plugins.txt
@@ -1604,7 +1604,7 @@
[source,java]
----
-public class HttpModule extends HttpPluginModule {
+public class HttpModule extends ServletModule {
@Override
protected void configureServlets() {
DynamicSet.bind(binder(), WebUiPlugin.class)
@@ -1925,7 +1925,7 @@
[source,java]
----
-public class HttpModule extends HttpPluginModule {
+public class HttpModule extends ServletModule {
@Override
protected void configureServlets() {
@@ -2459,9 +2459,9 @@
/** Register the LfsApiServlet to listen on the default LFS protocol endpoint */
import static com.google.gerrit.httpd.plugins.LfsPluginServlet.URL_REGEX;
-import com.google.gerrit.httpd.plugins.HttpPluginModule;
+import com.google.inject.servlet.ServletModule;
-public class HttpModule extends HttpPluginModule {
+public class HttpModule extends ServletModule {
@Override
protected void configureServlets() {
