Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Update mockito-core to 2.24.0
Change-Id: I0cf79b45de4cffd5cdaa995359e704f07fdcde0d
diff --git a/WORKSPACE b/WORKSPACE
index e7aba63..650c9aa 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,14 +3,14 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "2c39029a585bd1d5b785150948f162730f7b7e42",
+ commit = "ca34f0cf89b2e041ea7f4aa4b9696efc2d76746f",
#local_path = "/home/<user>/projects/bazlets",
)
#Snapshot Plugin API
#load(
-# "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-# "gerrit_api_maven_local",
+# "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+# "gerrit_api_maven_local",
#)
# Load snapshot Plugin API
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/Module.java b/src/main/java/com/googlesource/gerrit/plugins/quota/Module.java
index a762579..e514334 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/quota/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/quota/Module.java
@@ -76,6 +76,7 @@
DynamicSet.bind(binder(), ProjectDeletedListener.class).to(DeletionListener.class);
DynamicSet.bind(binder(), GarbageCollectorListener.class).to(GCListener.class);
DynamicSet.setOf(binder(), UsageDataEventCreator.class);
+ DynamicSet.bind(binder(), UsageDataEventCreator.class).to(RepoSizeEventCreator.class);
install(MaxRepositorySizeQuota.module());
install(
new RestApiModule() {