summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2018-04-10 02:51:52 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-04-10 02:51:52 +0000
commit12c5d17867f609b58536fc274f6d32eb60feca44 (patch)
tree51f727fe146f7026b5770108f740f844bcdc34cd
parent81600726e0c001f7f991c3525acefc6a43c1a719 (diff)
parent73c00d471619a0718bc275cb1a91228e7c93af16 (diff)
Merge "GerritServerId: Update comment for correct location of server Id" into stable-2.14
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerId.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerId.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerId.java
index 87dc44a3e5..237f18c359 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerId.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerId.java
@@ -22,7 +22,8 @@ import java.lang.annotation.Retention;
/**
* Marker on a string holding a unique identifier for the server.
*
- * <p>This value is generated on first use and stored in {@code $site_path/etc/uuid}.
+ * <p>This value is generated on first use and stored in {@code gerrit.serverId} in {@code
+ * gerrit.config}.
*/
@Retention(RUNTIME)
@BindingAnnotation