commit e29dbfad0b92dad73e4288a9ed9af75118fc6207
author Ben Rohlfs <brohlfs@google.com> Tue Dec 10 12:14:24 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 10 12:14:24 2019 +0000
tree e0f27989470e21c126f78cc6599ede5f40dc1c69
parent 15d851681ead60478dd63f29a5d487d4be02d15b
parent f46139f1cd5761627bf8f0f2136deaf224304b81

Merge "[Cleanup] Tidy up the "Please fix." comment"

Documentation/backup.txt

diff --git a/Documentation/backup.txt b/Documentation/backup.txt
index ed044ba..cd247af 100644
--- a/Documentation/backup.txt
+++ b/Documentation/backup.txt
@@ -162,9 +162,9 @@
 Best you use a filesystem supporting snapshots to create a backup archive
 of such a replica.
 
-For 2.x Gerrit versions also set up a database slave for the data stored in the
+For 2.x Gerrit versions also set up a database replica for the data stored in the
 SQL database. If you are using 2.16 and migrated to _NoteDb_ you may consider to
-skip setting up a database slave, instead take a backup of the database which only
+skip setting up a database replica, instead take a backup of the database which only
 contains the current schema version in this case.
 In addition you need to ensure that no write operations are in flight before you
 take the replica offline. Otherwise the database backup might be inconsistent
@@ -176,8 +176,8 @@
 link:https://gerrit.googlesource.com/plugins/replication/+/refs/heads/master/src/main/resources/Documentation/config.md[server option]
 `remote.NAME.replicateProjectDeletions`.
 
-If you are using Gerrit slaves to offload read traffic you can use one of these
-slaves for creating backups.
+If you are using Gerrit replica to offload read traffic you can use one of these
+replica for creating backups.
 
 [#cons-backup-offline]
 === Take master offline for backup

java/com/google/gerrit/httpd/restapi/RestApiServlet.java

diff --git a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
index 9c6637b..bd32c0b 100644
--- a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
+++ b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
@@ -1692,7 +1692,7 @@
         }
 
         res.setStatus(statusCode.get());
-        logger.atFinest().withCause(err).log("REST call finished: %d", statusCode);
+        logger.atFinest().withCause(err).log("REST call finished: %d", statusCode.get().intValue());
         return replyText(req, res, true, msg.toString());
       }
 

plugins/replication

diff --git a/plugins/replication b/plugins/replication
index 38a027f..b3ed3c8 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit 38a027fb3013c9ed28c5b2a1703e32975785f8b7
+Subproject commit b3ed3c8f9a8bab51beed794de5be8fd6da44231a

tools/nongoogle.bzl

diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
index 6a29da6..e16c0a0 100644
--- a/tools/nongoogle.bzl
+++ b/tools/nongoogle.bzl
@@ -23,8 +23,8 @@
 
     maven_jar(
         name = "dropwizard-core",
-        artifact = "io.dropwizard.metrics:metrics-core:4.1.1",
-        sha1 = "ebfafc716d9c3b6151dc7c2c09ce925a163a4f21",
+        artifact = "io.dropwizard.metrics:metrics-core:4.1.2",
+        sha1 = "bba231bbf3024c19e75622ec168821cbbd4261a4",
     )
 
     SSHD_VERS = "2.3.0"