[JENKINS-27601] instance caps incorrectly calculated (fix description)

jenkinsci · Aug 18, 2015 · ad614db · ad614db
1 parent b27bea5
commit ad614db
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/resources/hudson/plugins/ec2/SlaveTemplate/config.jelly b/src/main/resources/hudson/plugins/ec2/SlaveTemplate/config.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" >
   <table width="100%">
 
-  <f:entry title="${%Description}" help="/help/system-config/master-slave/description.html" field="description">
+  <f:entry title="${%Description}" field="description">
     <f:textbox />
   </f:entry>
 

diff --git a/src/main/resources/hudson/plugins/ec2/SlaveTemplate/help-description.html b/src/main/resources/hudson/plugins/ec2/SlaveTemplate/help-description.html
@@ -0,0 +1,13 @@
+<div>
+Optional human-readable description of this slave. This information is displayed on the project 
+configuration screen.
+<br>
+When you have slaves that are different from others, 
+it's often helpful to use this field to explain what is different. 
+For example, entering "Windows slave" in this field would allow project owners to 
+choose to always build on a Windows machine (for example, if they need some Windows-specific build tool.)
+<br>
+For EC2 slaves, this is also used to allow the same AMI to be used multiple times and separately manage
+the number of instances associated with each slave. The description forms part of the key (with the AMI id)
+to determine the number of active instances.
+</div>