Merge branch 'stable-2.15'

* stable-2.15:
  Fix typo in cmd-stream-events.txt
  Replace "the the" occurences with "the" (wrong repetition)

Change-Id: Iccce5845c697be54e0cd2257ab39f90a02bfe27e
This commit is contained in:
David Pursehouse
2018-04-19 09:38:17 +02:00
5 changed files with 7 additions and 7 deletions

View File

@@ -264,7 +264,7 @@ created.
=== Work In Progress State Changed === Work In Progress State Changed
Sent when the the link:intro-user.html#wip[WIP] state of the change has changed. Sent when the link:intro-user.html#wip[WIP] state of the change has changed.
type:: wip-state-changed type:: wip-state-changed
@@ -277,7 +277,7 @@ created.
=== Private State Changed === Private State Changed
Sent when the the link:intro-user.html#private-changes[private] state of the Sent when the link:intro-user.html#private-changes[private] state of the
change has changed. change has changed.
type:: private-state-changed type:: private-state-changed

View File

@@ -27,7 +27,7 @@ To take advantage of this feature, one should:
.. a url that starts with the link:config-gerrit.html#gerrit.canonicalWebUrl[`gerrit.canonicalWebUrl`] .. a url that starts with the link:config-gerrit.html#gerrit.canonicalWebUrl[`gerrit.canonicalWebUrl`]
When a commit in a project is merged, Gerrit checks for superprojects When a commit in a project is merged, Gerrit checks for superprojects
that are subscribed to the the project and automatically updates those that are subscribed to the project and automatically updates those
superprojects with a commit that updates the gitlink for the project. superprojects with a commit that updates the gitlink for the project.
This feature is enabled by default and can be disabled This feature is enabled by default and can be disabled

View File

@@ -23,8 +23,8 @@ public interface ExternalIncludedIn {
/** /**
* Returns additional entries for IncludedInInfo as multimap where the key is the row title and * Returns additional entries for IncludedInInfo as multimap where the key is the row title and
* the the values are a list of systems that include the given commit (e.g. names of servers on * the values are a list of systems that include the given commit (e.g. names of servers on which
* which this commit is deployed). * this commit is deployed).
* *
* <p>The tags and branches in which the commit is included are provided so that a RevWalk can be * <p>The tags and branches in which the commit is included are provided so that a RevWalk can be
* avoided when a system runs a certain tag or branch. * avoided when a system runs a certain tag or branch.

View File

@@ -106,7 +106,7 @@ public abstract class AllRequestFilter implements Filter {
throws IOException, ServletException { throws IOException, ServletException {
while (itr.hasNext()) { while (itr.hasNext()) {
AllRequestFilter filter = itr.next(); AllRequestFilter filter = itr.next();
// To avoid {@code synchronized} on the the whole filtering (and // To avoid {@code synchronized} on the whole filtering (and
// thereby killing concurrency), we start the below disjunction // thereby killing concurrency), we start the below disjunction
// with an unsynchronized check for containment. This // with an unsynchronized check for containment. This
// unsynchronized check is always correct if no filters got // unsynchronized check is always correct if no filters got

View File

@@ -146,7 +146,7 @@ public class IncludedInResolver {
* <li>after = commits with time >= target.getCommitTime() * <li>after = commits with time >= target.getCommitTime()
* </ul> * </ul>
* *
* Each of the before/after lists is sorted by the the commit time. * Each of the before/after lists is sorted by the commit time.
* *
* @param before * @param before
* @param after * @param after