Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Upgrade JGit to 4.9.8.201812241815-r
Upgrade JGit to 4.7.7.201812240805-r
Change-Id: I2a4e8ff6c7672b40a6b33f270a92586eaa283852
diff --git a/WORKSPACE b/WORKSPACE
index a99b0f7..04c74f7 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "2b1d68959119920e5fa9bdfb9f0cf926bfef4929",
+ commit = "b084bd74743f4303971a2a057bcea4f3352ddf4e",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/ShowQueue.java b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/ShowQueue.java
index fe41af0..4cd7417 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/ShowQueue.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/ShowQueue.java
@@ -19,9 +19,9 @@
import com.ericsson.gerrit.plugins.gcconductor.GcQueue;
import com.ericsson.gerrit.plugins.gcconductor.RepositoryInfo;
import com.google.common.base.Strings;
-import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.extensions.annotations.RequiresCapability;
+import com.google.gerrit.server.util.time.TimeUtil;
import com.google.gerrit.sshd.AdminHighPriorityCommand;
import com.google.gerrit.sshd.CommandMetaData;
import com.google.gerrit.sshd.SshCommand;