IPP Software

Navigation

Tools

IPP Links

Communication

Pan-STARRS Links

Context Navigation

← Previous Change
Next Change →

Changeset 31434 for branches/czw_branch/20110406/ippMonitor/def/addRunProcessed.d

Timestamp:

May 4, 2011, 3:20:38 PM (15 years ago)

Author:

watersc1

Message:

Merging trunk into this branch

Location:

branches/czw_branch/20110406

Files:

: 2 edited

. (modified) (1 prop)
ippMonitor/def/addRunProcessed.d (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/czw_branch/20110406

Property svn:mergeinfo changed

merged: 31263,31265-31271,31276-31277,31279,31283-31289,31291-31293,31298-31301,31303-31305,31315-31316,31318-31325,31329-31333,31341-31357,31365-31368,31370-31371,31373,31375-31380,31382-31383,31386-31391,31394-31395,31398-31406,31408,31410-31414,31421-31422,31425,31427,31431

branches/czw_branch/20110406/ippMonitor/def/addRunProcessed.d

-              r30453
+              r31434
 FIELD distinct(addRun.add_id),        5, %d,     add ID
+FIELD addRun.cam_id,          5, %d,     cam ID
+FIELD addRun.stage,        5, %s,     stage
+FIELD addRun.stage_id,          5, %d,     cam ID
 FIELD addRun.state,        5, %s,     state
 FIELD addProcessedExp.fault,        5, %d,     fault

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

Download in other formats: