commit 434605779bb51a58dd027a76a8498b5611d76bc9
author Marco Miller <marco.miller@ericsson.com> Wed Oct 16 13:14:22 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed Oct 16 13:14:22 2019 -0400
tree 18d514774e504643bad29a1aab123f1d68c8ad57
parent bd57bb88a5fb2b22f8221d10c4c2a8ce01cd2352
parent ba9a8c3be1232079fb241cc75605e71927ad2313

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Replace bazel-genfiles with bazel-bin in documentation

Change-Id: I1496826af979861ef9391d113430379535a152e4

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index adbdda2..7f1f8ce 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ae1cd231b0262b2738e6c0593eb3c504209ad4f5",
+    commit = "ec989bb514e39447764057c60d3f9959bff8e153",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java b/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java
index e728713..d297b26 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java
@@ -21,7 +21,7 @@
 import com.google.gerrit.server.config.CanonicalWebUrl;
 import com.google.gerrit.server.project.ProjectCache;
 import com.google.gerrit.server.project.ProjectState;
-import com.google.gwtexpui.server.CacheHeaders;
+import com.google.gerrit.util.http.CacheHeaders;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import java.io.IOException;