diff options
author | mr <mr@mrautenberg.de> | 2011-06-15 13:19:12 +0200 |
---|---|---|
committer | mr <mr@mrautenberg.de> | 2011-06-15 13:19:12 +0200 |
commit | e06c018afbae2066950bc1cd43262cf7a501ba90 (patch) | |
tree | a65f1a6bed346396db09b76d8f26db8c135c715f | |
parent | 7bbc70d38d81a5a57d90c525d90ccf7bf8f59426 (diff) | |
parent | 59e1a2406354ce8a7e2b1a78f03d6ecaf6dbb297 (diff) |
clean merge with hotfix
-rwxr-xr-x | reach_reports/reach_application.rb | 2 | ||||
-rwxr-xr-x | reach_reports/reach_persistance.rb | 1 | ||||
-rwxr-xr-x | reach_reports/reach_service.rb | 1 | ||||
-rw-r--r-- | report/statistical_test.rb | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/reach_reports/reach_application.rb b/reach_reports/reach_application.rb index 477adfb..fe40487 100755 --- a/reach_reports/reach_application.rb +++ b/reach_reports/reach_application.rb @@ -18,7 +18,7 @@ def mysql_lite_retry( n_times=15 ) end yield # try a last time end - + require 'reach_reports/reach_persistance.rb' require 'reach_reports/reach_service.rb' diff --git a/reach_reports/reach_persistance.rb b/reach_reports/reach_persistance.rb index 147ee84..1226d95 100755 --- a/reach_reports/reach_persistance.rb +++ b/reach_reports/reach_persistance.rb @@ -1210,6 +1210,7 @@ module ReachReports model.auto_upgrade! model.raise_on_save_failure = true end + end end
\ No newline at end of file diff --git a/reach_reports/reach_service.rb b/reach_reports/reach_service.rb index c93385c..fa4c0d7 100755 --- a/reach_reports/reach_service.rb +++ b/reach_reports/reach_service.rb @@ -279,6 +279,7 @@ module ReachReports end end task.progress(90) if task + mysql_lite_retry do r.save end diff --git a/report/statistical_test.rb b/report/statistical_test.rb index bee6241..9461cac 100644 --- a/report/statistical_test.rb +++ b/report/statistical_test.rb @@ -78,7 +78,7 @@ module Reports def self.quit_r LIB::StatisticalTest.quit_r end - + end end |