From: Anil Belur Date: Wed, 10 Jul 2019 00:12:22 +0000 (+0000) Subject: Merge "Handle stack removal with the force option" X-Git-Tag: v0.40.0~21 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=0278e1dec03cb9edbac39beef86cfca3d96a5b52;hp=9aa38f3b49cbc2f18ce131fd86d20d0234a411d3;p=releng%2Fglobal-jjb.git Merge "Handle stack removal with the force option" --- diff --git a/docs/jjb/lf-info-vote.rst b/docs/jjb/lf-info-vote.rst index 76c6d3de..64151f1f 100644 --- a/docs/jjb/lf-info-vote.rst +++ b/docs/jjb/lf-info-vote.rst @@ -7,7 +7,7 @@ INFO VOTE JOB Job counts the votes from the committers against a change to the INFO.yaml file -If needed, will also check for a majority of tsc voters +If needed, will also check for a majority of TSC voters (not yet implemented) Auto-merges the change on a majority vote. diff --git a/docs/jjb/lf-macros.rst b/docs/jjb/lf-macros.rst index ab70a9fa..6772eeef 100644 --- a/docs/jjb/lf-macros.rst +++ b/docs/jjb/lf-macros.rst @@ -250,7 +250,7 @@ Calls shell script to validate votes on a change to an INFO.yaml lf-releases ----------- -realises lftools.ini (required) +releases lftools.ini (required) needed to push to nexus. [nexus] diff --git a/docs/jjb/lf-release-jobs.rst b/docs/jjb/lf-release-jobs.rst index b3a78e00..85652356 100644 --- a/docs/jjb/lf-release-jobs.rst +++ b/docs/jjb/lf-release-jobs.rst @@ -28,7 +28,7 @@ Macros ====== lf-releases ----------------------- +----------- Release verify and merge jobs are the same except for their scm, trigger, and builders definition. This anchor is the common template.