Changeset 35236 for branches/eam_branches/ipp-20130207/ippTasks/background.pro

Timestamp:

Mar 5, 2013, 2:24:05 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130207

Files:

• . (modified) (1 prop)
• ippTasks (modified) (1 prop)
• ippTasks/background.pro (modified) (3 diffs)

branches/eam_branches/ipp-20130207/ippTasks/background.pro

@@ -241 +241 @@
     else
       # save the DB name for the exit tasks
-      option $DB:$chip_advance_DB
+      option $DB:$bg_chip_advance_DB
       $run = $run -dbname $DB:$bg_chip_advance_DB
       $bg_chip_advance_DB ++
@@ -446 +446 @@
 
   periods      -poll $LOADPOLL
-#  periods      -exec $LOADEXEC
   periods      -exec 30
   periods      -timeout 60
@@ -461 +460 @@
     else
       # save the DB name for the exit tasks
-      option $DB:$warp_advance_DB
+      option $DB:$bg_warp_advance_DB
       $run = $run -dbname $DB:$bg_warp_advance_DB
       $bg_warp_advance_DB ++