svn commit: r1517299 - in /jmeter/trunk: docs/images/screenshots/os_process_sampler.png xdocs/changes.xml xdocs/images/screenshots/os_process_sampler.png xdocs/usermanual/component_reference.xml

[pm...@apache.org]

Author: pmouawad
Date: Sun Aug 25 14:36:14 2013
New Revision: 1517299

URL: http://svn.apache.org/r1517299
Log:
Bug 55403 - Enhancement to OS sampler: Support for timeout
Update docs
Bugzilla Id: 55403

Modified:
    jmeter/trunk/docs/images/screenshots/os_process_sampler.png
    jmeter/trunk/xdocs/changes.xml
    jmeter/trunk/xdocs/images/screenshots/os_process_sampler.png
    jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/docs/images/screenshots/os_process_sampler.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/os_process_sampler.png?rev=1517299&r1=1517298&r2=1517299&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1517299&r1=1517298&r2=1517299&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Aug 25 14:36:14 2013
@@ -75,7 +75,7 @@ citizen in JMeter, you can now test your
 
 <h4>* Timeout has been added to OS Process Sampler</h4>
 <p>
-<figure width="540" height="600" image="changes/2.10/17_os_process_timeout.png"></figure>
+<figure width="684" height="586" image="changes/2.10/17_os_process_timeout.png"></figure>
 </p>
 
 <h4>* Query timeout has been added to JDBC Request</h4>

Modified: jmeter/trunk/xdocs/images/screenshots/os_process_sampler.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/os_process_sampler.png?rev=1517299&r1=1517298&r2=1517299&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1517299&r1=1517298&r2=1517299&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sun Aug 25 14:36:14 2013
@@ -1830,7 +1830,7 @@ Note: If the message body is not empty, 
 </properties>
 </component>
 
-<component name="OS Process Sampler"  index="&sect-num;.1.20"  width="783" height="593" screenshot="os_process_sampler.png">
+<component name="OS Process Sampler"  index="&sect-num;.1.20"  width="683" height="582" screenshot="os_process_sampler.png">
 <description>
 <p>
 The OS Process Sampler is a sampler that can be used to execute commands on the local machine.<br></br>
@@ -1874,6 +1874,7 @@ If omitted, output is captured and retur
 </properties>
 <property name="Check Return Code" required="No">If checked, sampler will compare return code with Expected Return Code.</property>
 <property name="Expected Return Code" required="No">Expected return code for System Call, required if "Check Return Code" is checked.</property>
+<property name="Timeout" required="No">Timeout for command in milliseconds, defaults to 0, which means NO timeout.</property>
 </component>
 
 <component name="MongoDB Script (alpha)" index="&sect-num;.1.21" width="847" height="635" screenshot="mongodb-script.png">