Author: bugman Date: Tue Apr 2 11:06:35 2013 New Revision: 19286 URL: http://svn.gna.org/viewcvs/relax?rev=19286&view=rev Log: Manually merged r19282 from the 2.2 development line to trunk. The command used was: svn merge -r19282:19283 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/2.2 . ..... r19283 | bugman | 2013-04-02 10:58:10 +0200 (Tue, 02 Apr 2013) | 3 lines Changed paths: M /branches/2.2/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py Decreased the number of Monte Carlo simulations in the Ct.test_bug_20674_ct_analysis_failure system test. ..... Modified: trunk/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py Modified: trunk/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py?rev=19286&r1=19285&r2=19286&view=diff ============================================================================== --- trunk/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py (original) +++ trunk/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py Tue Apr 2 11:06:35 2013 @@ -49,7 +49,7 @@ calc() # Monte Carlo simulations. -monte_carlo.setup(number=500) +monte_carlo.setup(number=10) monte_carlo.create_data() calc() monte_carlo.error_analysis()