Context Navigation

fftool_result.sql

Timestamp:

Apr 1, 2014, 11:03:38 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20140206

Files:

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20140226 (added)	merged: 36561,36563,36619-36622
/tags/ipp-20140114 (added)	merged: 36444-36446,36448,36450,36461-36462,36513,36538-36540,36546-36547,36551,36554
/trunk	merged: 36537,36541-36544,36552-36553,36555-36556,36572,36579-36583,36594-36596,36603,36605,36610,36614-36615,36623

-              r36441
+              r36627
 SELECT
     fullForceResult.*,
     fullForceRun.skycal_id,
+    fullForceRun.state,
     fullForceRun.label,
     fullForceRun.data_group,
+    fullForceRun.skycal_id,
+    fullForceRun.workdir,
+    CONCAT_WS('.', warp_id, skycell_id) AS dist_component,
     stackRun.tess_id,
     stackRun.skycell_id,

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