2012-05-16 Dario Rodriguez <dario.rodriguez@artica.es>

* util/pandora_xml_stress.conf: Fixed a wrong default configuration file
	for pandora_xmk_stress

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6303 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2012-05-16 04:59:22 +00:00
parent add0143e94
commit 9b096f7a4a
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,10 @@
2012-05-16 Dario Rodriguez <dario.rodriguez@artica.es>
* util/pandora_xml_stress.conf: Fixed a wrong default configuration file
for pandora_xmk_stress
MERGED FROM 4.0.2
2012-05-11 Junichi Satoh <junichi@rworks.jp>
* ChangeLog: Fixed conflict with previous commit. (Added lost lines.)

View File

@ -128,7 +128,6 @@ module_name Disk_Free
module_type generic_data
module_description Disk space available in MB.
module_unit MB
module_exec type=SCATTER;prob=2;avg=1000;min=200;max=1200
module_exec type=CURVE;min=20;max=80;time_wave_length=3600;time_offset=0
module_end