Merge "Ensure consistent sorting order for plugin endpoints"
diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt
index e8f9a6a..60f71c9 100644
--- a/Documentation/rest-api-changes.txt
+++ b/Documentation/rest-api-changes.txt
@@ -6676,22 +6676,22 @@
[[change-id]]
=== \{change-id\}
Identifier that uniquely identifies one change. It contains the URL-encoded
-project name as well as the change number: "'$$<project>~<changeNumber>$$'"
+project name as well as the change number: "<project>~<changeNumber>"
==== Alternative identifiers
Gerrit also supports an array of other change identifiers.
[NOTE]
Even though these identifiers will work in the majority of cases it is highly
-recommended to use "'$$<project>~<changeNumber>$$'" whenever possible.
+recommended to use "<project>~<changeNumber>" whenever possible.
Since these identifiers require additional lookups from index and caches, to
-be translated to the "'$$<project>~<changeNumber>$$'" identifier, they
+be translated to the "<project>~<changeNumber>" identifier, they
may result in both false-positives and false-negatives.
Furthermore the additional lookup mean that they come with a performance penalty.
-* an ID of the change in the format "'$$<project>~<branch>~<Change-Id>$$'",
+* an ID of the change in the format "<project>~<branch>~<Change-Id>",
where for the branch the `refs/heads/` prefix can be omitted
- ("$$myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940$$")
+ ("myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940")
* a Change-Id if it uniquely identifies one change
("I8473b95934b5732ac55d26311a706c9c2bde9940")
* a change number if it uniquely identifies one change ("4247")
diff --git a/java/com/google/gerrit/acceptance/GerritServer.java b/java/com/google/gerrit/acceptance/GerritServer.java
index e812cb7..5d52179 100644
--- a/java/com/google/gerrit/acceptance/GerritServer.java
+++ b/java/com/google/gerrit/acceptance/GerritServer.java
@@ -452,10 +452,11 @@
bind(TestTicker.class).toInstance(testTicker);
}
});
- daemon.setEnableHttpd(desc.httpd());
- // Assure that SSHD is enabled if HTTPD is not required, otherwise the Gerrit server would not
- // even start.
- daemon.setEnableSshd(!desc.httpd() || desc.useSsh());
+ // Assure that HTTPD is enabled if SSHD is not required. If both are disabled the Gerrit server
+ // does not start. Alternatively we could assure that SSHD is enabled if HTTPD is not required,
+ // but this would break the tests at Google, because they don't have support for SSHD.
+ daemon.setEnableHttpd(desc.httpd() || !desc.useSsh());
+ daemon.setEnableSshd(desc.useSsh());
daemon.setReplica(
ReplicaUtil.isReplica(baseConfig) || ReplicaUtil.isReplica(desc.buildConfig(baseConfig)));
