From 6fc11a4bc987dfb1bb8da2efbd8ecc356547ed77 Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Tue, 12 Aug 2014 20:59:07 +0200 Subject: [PATCH] [FIXED JENKINS-19586] Change description of 'tied' node mode --- core/src/main/resources/hudson/model/Messages.properties | 4 ++-- .../main/webapp/help/system-config/master-slave/usage.html | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties index 3a513d3712..7c5af4c279 100644 --- a/core/src/main/resources/hudson/model/Messages.properties +++ b/core/src/main/resources/hudson/model/Messages.properties @@ -311,11 +311,11 @@ ChoiceParameterDefinition.MissingChoices=Requires Choices. RunParameterDefinition.DisplayName=Run Parameter PasswordParameterDefinition.DisplayName=Password Parameter -Node.BecauseNodeIsReserved={0} is reserved for jobs tied to it +Node.BecauseNodeIsReserved={0} is reserved for jobs with matching label expression Node.LabelMissing={0} doesn\u2019t have label {1} Node.LackingBuildPermission={0} doesn\u2019t have a permission to run on {1} Node.Mode.NORMAL=Utilize this node as much as possible -Node.Mode.EXCLUSIVE=Leave this node for tied jobs only +Node.Mode.EXCLUSIVE=Only build jobs with label restrictions matching this node ListView.DisplayName=List View diff --git a/war/src/main/webapp/help/system-config/master-slave/usage.html b/war/src/main/webapp/help/system-config/master-slave/usage.html index 122f163470..6180ec7b56 100644 --- a/war/src/main/webapp/help/system-config/master-slave/usage.html +++ b/war/src/main/webapp/help/system-config/master-slave/usage.html @@ -12,11 +12,12 @@
- Leave this node for tied jobs only + Only build jobs with label restrictions matching this node
In this mode, Jenkins will only build a project on this node when - that project specifically was tied to that node. + that project is restricted to certain nodes using a label expression, + and that expression matches this node's name and/or labels. This allows a slave to be reserved for certain kinds of jobs. For example, to run performance tests continuously from Jenkins,