Merge branch 'stable-3.7' into stable-3.8
* stable-3.7:
Fix ordering of parameters for apply objects log
Change-Id: I569da6f85cadd33905f3baa7eb9136a49c278b7d
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectAction.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectAction.java
index d535ac9..9911070 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectAction.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectAction.java
@@ -67,8 +67,8 @@
try {
repLog.info(
"Apply object API from {} for {}:{} - {}",
- resource.getNameKey(),
input.getLabel(),
+ resource.getNameKey(),
input.getRefName(),
input.getRevisionData());
@@ -76,8 +76,8 @@
deleteRefCommand.deleteRef(resource.getNameKey(), input.getRefName(), input.getLabel());
repLog.info(
"Apply object API - REF DELETED - from {} for {}:{} - {}",
- resource.getNameKey(),
input.getLabel(),
+ resource.getNameKey(),
input.getRefName(),
input.getRevisionData());
return Response.withStatusCode(HttpServletResponse.SC_NO_CONTENT, "");
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectsAction.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectsAction.java
index 817ea00..ffd5bfc 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectsAction.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectsAction.java
@@ -66,8 +66,8 @@
repLog.info(
"Apply object API from {} for {}:{} - {}",
- resource.getNameKey(),
input.getLabel(),
+ resource.getNameKey(),
input.getRefName(),
Arrays.toString(input.getRevisionsData()));
@@ -75,8 +75,8 @@
deleteRefCommand.deleteRef(resource.getNameKey(), input.getRefName(), input.getLabel());
repLog.info(
"Apply object API - REF DELETED - from {} for {}:{}",
- resource.getNameKey(),
input.getLabel(),
+ resource.getNameKey(),
input.getRefName());
return Response.withStatusCode(HttpServletResponse.SC_NO_CONTENT, "");
}
