Context Navigation

staticsky.pro

Timestamp:

Dec 18, 2012, 5:57:19 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20121130/ippTasks

Files:

Property svn:mergeinfo set to

/branches/czw_branch/20101203/ippTasks	merged	eligible
/branches/czw_branch/20120906/ippTasks	merged	eligible
/branches/eam_branches/ipp-20101103/ippTasks	merged	eligible
/branches/eam_branches/ipp-20101205/ippTasks	merged	eligible
/branches/eam_branches/ipp-20110213/ippTasks	merged	eligible
/branches/eam_branches/ipp-20110404/ippTasks	merged	eligible
/branches/eam_branches/ipp-20110505/ippTasks	merged	eligible
/branches/eam_branches/ipp-20110710/ippTasks	merged	eligible
/branches/eam_branches/ipp-20110906/ippTasks	merged	eligible
/branches/eam_branches/ipp-20111110/ippTasks	merged	eligible
/branches/eam_branches/ipp-20120405/ippTasks	merged	eligible
/branches/eam_branches/ipp-20120601/ippTasks	merged	eligible
/branches/eam_branches/ipp-20120627/ippTasks	merged	eligible
/branches/eam_branches/ipp-20120805/ippTasks	merged	eligible
/branches/eam_branches/ipp-20120905/ippTasks	merged	eligible
/branches/haf_add201112/ippTasks	merged	eligible
/tags/ipp-20110622/ippTasks	merged	eligible
/trunk/ippTasks	merged	eligible

-              r33957
+              r34839
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC
   periods      -timeout 30
+  periods      -exec 30
+  periods      -timeout 60
   npending     1
 …
     # set the host and workdir based on the skycell hash
+    set.host.for.skycell $SKYCELL_ID
+    # set.host.for.skycell $SKYCELL_ID
+    host anyhost
     set.workdir.by.skycell $SKYCELL_ID $WORKDIR_TEMPLATE $default_host WORKDIR

Note: See TracChangeset for help on using the changeset viewer.