From caa2f9dc3a1a497cfbf3db638b785c01b0b2e637 Mon Sep 17 00:00:00 2001 From: darode Date: Wed, 16 May 2012 04:59:22 +0000 Subject: [PATCH] 2012-05-16 Dario Rodriguez * 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 --- pandora_server/ChangeLog | 7 +++++++ pandora_server/util/pandora_xml_stress.conf | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 5c32f3d5f5..8460972ddc 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,10 @@ +2012-05-16 Dario Rodriguez + + * 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 * ChangeLog: Fixed conflict with previous commit. (Added lost lines.) diff --git a/pandora_server/util/pandora_xml_stress.conf b/pandora_server/util/pandora_xml_stress.conf index 6cb2be235d..25a86134ec 100644 --- a/pandora_server/util/pandora_xml_stress.conf +++ b/pandora_server/util/pandora_xml_stress.conf @@ -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