Note: Added additional revisions requested by Kana on 5/02/14. - RS 5/02/14

Note: Added additional revisions requested by Kana on 4/18/14. - RS 4/21/14

Note: List reviewed by Kana on 4/7/14. Ready to merge. - RS 4/7/14

Here is the list of Revisions and codes that should be merged from trunk (as of r29130) to 4.2.2 branch:

[ASAP]

// All commits from trunk.
// This may include some duplicates that have already been merged to release-4_2_2.

r2917 | TakeshiNakazato | 2014-04-03 02:17:29 -0600 (Thu, 03 Apr 2014) | 16 lines
r2916 | TakeshiNakazato | 2014-04-02 20:45:09 -0600 (Wed, 02 Apr 2014) | 18 lines
r2915 | TakeshiNakazato | 2014-04-02 01:38:27 -0600 (Wed, 02 Apr 2014) | 17 lines
r2914 | TakeshiNakazato | 2014-04-01 22:37:53 -0600 (Tue, 01 Apr 2014) | 16 lines
r2913 | TakeshiNakazato | 2014-03-31 20:57:47 -0600 (Mon, 31 Mar 2014) | 16 lines
r2912 | TakeshiNakazato | 2014-03-31 20:47:06 -0600 (Mon, 31 Mar 2014) | 16 lines
r2911 | TakeshiNakazato | 2014-03-31 20:05:18 -0600 (Mon, 31 Mar 2014) | 18 lines
r2910 | WataruKawasaki | 2014-03-26 03:42:31 -0600 (Wed, 26 Mar 2014) | 14 lines
r2909 | WataruKawasaki | 2014-03-24 00:32:50 -0600 (Mon, 24 Mar 2014) | 14 lines
r2908 | TakeshiNakazato | 2014-03-23 20:47:07 -0600 (Sun, 23 Mar 2014) | 16 lines
r2907 | TakTsutsumi | 2014-03-20 12:25:31 -0600 (Thu, 20 Mar 2014) | 19 lines
r2906 | TakeshiNakazato | 2014-03-14 02:32:29 -0600 (Fri, 14 Mar 2014) | 17 lines
r2905 | TakeshiNakazato | 2014-03-13 00:24:50 -0600 (Thu, 13 Mar 2014) | 16 lines
r2904 | TakeshiNakazato | 2014-03-12 20:59:13 -0600 (Wed, 12 Mar 2014) | 16 lines
r2903 | TakeshiNakazato | 2014-03-12 20:25:06 -0600 (Wed, 12 Mar 2014) | 16 lines
r2902 | TakeshiNakazato | 2014-03-11 23:00:54 -0600 (Tue, 11 Mar 2014) | 17 lines
r2901 | TakeshiNakazato | 2014-03-11 19:47:05 -0600 (Tue, 11 Mar 2014) | 16 lines
r2900 | TakeshiNakazato | 2014-03-11 19:23:31 -0600 (Tue, 11 Mar 2014) | 20 lines
r2899 | TakeshiNakazato | 2014-03-10 21:17:00 -0600 (Mon, 10 Mar 2014) | 17 lines
r2898 | KanaSugimoto | 2014-03-06 01:32:19 -0700 (Thu, 06 Mar 2014) | 14 lines
r2897 | WataruKawasaki | 2014-02-23 19:22:48 -0700 (Sun, 23 Feb 2014) | 14 lines
r2896 | WataruKawasaki | 2014-02-20 03:40:16 -0700 (Thu, 20 Feb 2014) | 14 lines
r2895 | WataruKawasaki | 2014-02-19 02:41:19 -0700 (Wed, 19 Feb 2014) | 14 lines
r2894 | TakeshiNakazato | 2014-01-31 01:07:26 -0700 (Fri, 31 Jan 2014) | 16 lines
r2893 | KanaSugimoto | 2014-01-20 03:00:50 -0700 (Mon, 20 Jan 2014) | 14 lines
r2892 | WataruKawasaki | 2014-01-15 20:20:46 -0700 (Wed, 15 Jan 2014) | 14 lines
r2891 | WataruKawasaki | 2014-01-15 19:06:13 -0700 (Wed, 15 Jan 2014) | 14 lines
r2890 | WataruKawasaki | 2014-01-10 02:26:37 -0700 (Fri, 10 Jan 2014) | 14 lines
r2889 | WataruKawasaki | 2013-12-27 00:22:06 -0700 (Fri, 27 Dec 2013) | 14 lines
r2888 | KanaSugimoto | 2013-12-25 19:21:30 -0700 (Wed, 25 Dec 2013) | 16 lines
r2887 | WataruKawasaki | 2013-12-24 23:49:49 -0700 (Tue, 24 Dec 2013) | 14 lines
r2886 | WataruKawasaki | 2013-12-24 20:50:26 -0700 (Tue, 24 Dec 2013) | 14 lines
r2885 | WataruKawasaki | 2013-12-24 01:28:29 -0700 (Tue, 24 Dec 2013) | 14 lines
r2884 | WataruKawasaki | 2013-12-20 03:57:13 -0700 (Fri, 20 Dec 2013) | 14 lines
r2882 | WataruKawasaki | 2013-12-19 23:34:30 -0700 (Thu, 19 Dec 2013) | 14 lines
r2881 | TakeshiNakazato | 2013-12-16 22:58:32 -0700 (Mon, 16 Dec 2013) | 19 lines
r2880 | WataruKawasaki | 2013-12-13 01:00:06 -0700 (Fri, 13 Dec 2013) | 14 lines
r2876 | TakeshiNakazato | 2013-12-05 23:11:11 -0700 (Thu, 05 Dec 2013) | 16 lines
r2875 | TakeshiNakazato | 2013-12-05 19:21:08 -0700 (Thu, 05 Dec 2013) | 18 lines
r2874 | TakeshiNakazato | 2013-12-02 21:43:24 -0700 (Mon, 02 Dec 2013) | 16 lines
r2873 | TakeshiNakazato | 2013-12-02 19:57:35 -0700 (Mon, 02 Dec 2013) | 17 lines
r2872 | KanaSugimoto | 2013-12-02 19:09:42 -0700 (Mon, 02 Dec 2013) | 14 lines
r2871 | TakeshiNakazato | 2013-12-02 01:07:11 -0700 (Mon, 02 Dec 2013) | 16 lines
r2870 | TakeshiNakazato | 2013-12-01 23:56:41 -0700 (Sun, 01 Dec 2013) | 17 lines
r2869 | TakeshiNakazato | 2013-12-01 19:31:34 -0700 (Sun, 01 Dec 2013) | 21 lines
r2868 | TakeshiNakazato | 2013-12-01 19:25:27 -0700 (Sun, 01 Dec 2013) | 16 lines
r2867 | KanaSugimoto | 2013-11-24 22:47:38 -0700 (Sun, 24 Nov 2013) | 14 lines
r2866 | KanaSugimoto | 2013-11-07 00:59:43 -0700 (Thu, 07 Nov 2013) | 14 lines
r2865 | KanaSugimoto | 2013-11-07 00:42:23 -0700 (Thu, 07 Nov 2013) | 14 lines

[gcwrap]

r28361      // trunk gcwrap - RS Mandatory to pass the latest unit tests of 4.2.2 codes - KS
r28400      // trunk gcwrap - RS Mandatory to pass the latest unit tests of 4.2.2 codes - KS
r28690      // trunk gcwrap - RS Mandatory to pass the latest unit tests of 4.2.2 codes - KS
r27653      // trunk gcwrap - RS Addition of functional tests to test new feature - KS
r27684      // trunk gcwrap - RS Addition of functional tests to test new feature - KS

// 1. New files that all commits to the codes should be merged:

// tasks/tsdaverage.xml
// tasks/tsdcal2.xml
// tasks/tsdgrid.xml
// tasks/tsdplot.xml 
// tasks/tsdstat.xml
// tasks/tsdbaseline.xml
// tasks/tsdfit.xml
// tasks/tsdimaging.xml
// tasks/tsdreduce.xml
// tasks/tsdcal.xml    
// tasks/tsdflag.xml
// tasks/tsdmath.xml  
// tasks/tsdsave.xml

r27354 | scott.rankin | 2013-11-15 10:59:30 -0700 (Fri, 15 Nov 2013) | 53 lines      // May be a merge from 4_2_0 to trunk and can be omitted. 
r27599 | kana.sugimoto | 2013-12-05 00:33:38 -0700 (Thu, 05 Dec 2013) | 19 lines
r27601 | kana.sugimoto | 2013-12-05 03:00:03 -0700 (Thu, 05 Dec 2013) | 23 lines
r27629 | scott.rankin | 2013-12-06 11:32:58 -0700 (Fri, 06 Dec 2013) | 129 lines      // May be a merge from 4_2_0 to trunk and can be omitted. 
r27729 | kana.sugimoto | 2013-12-16 00:05:04 -0700 (Mon, 16 Dec 2013) | 26 lines
r27730 | kana.sugimoto | 2013-12-16 00:55:10 -0700 (Mon, 16 Dec 2013) | 14 lines
r27746 | takeshi.nakazato | 2013-12-16 20:09:36 -0700 (Mon, 16 Dec 2013) | 18 lines
r27747 | takeshi.nakazato | 2013-12-16 22:30:23 -0700 (Mon, 16 Dec 2013) | 23 lines
r27748 | kana.sugimoto | 2013-12-16 22:54:00 -0700 (Mon, 16 Dec 2013) | 18 lines
r27823 | kana.sugimoto | 2013-12-20 02:29:57 -0700 (Fri, 20 Dec 2013) | 17 lines
r27824 | kana.sugimoto | 2013-12-20 02:46:14 -0700 (Fri, 20 Dec 2013) | 14 lines
r27866 | takeshi.nakazato | 2013-12-24 01:04:03 -0700 (Tue, 24 Dec 2013) | 16 lines
r27867 | kana.sugimoto | 2013-12-24 01:54:39 -0700 (Tue, 24 Dec 2013) | 16 lines
r27868 | kana.sugimoto | 2013-12-24 02:05:28 -0700 (Tue, 24 Dec 2013) | 14 lines
r27872 | takeshi.nakazato | 2013-12-24 19:10:51 -0700 (Tue, 24 Dec 2013) | 16 lines
r27873 | kana.sugimoto | 2013-12-24 21:49:34 -0700 (Tue, 24 Dec 2013) | 20 lines
r27876 | kana.sugimoto | 2013-12-24 23:01:00 -0700 (Tue, 24 Dec 2013) | 16 lines
r27882 | kana.sugimoto | 2013-12-25 04:56:42 -0700 (Wed, 25 Dec 2013) | 17 lines
r27891 | kana.sugimoto | 2013-12-26 21:06:22 -0700 (Thu, 26 Dec 2013) | 14 lines
r27895 | kana.sugimoto | 2013-12-27 00:04:43 -0700 (Fri, 27 Dec 2013) | 16 lines
r27948 | kana.sugimoto | 2014-01-06 22:08:35 -0700 (Mon, 06 Jan 2014) | 26 lines
r28036 | wataru.kawasaki | 2014-01-14 00:14:00 -0700 (Tue, 14 Jan 2014) | 14 lines
r28068 | wataru.kawasaki | 2014-01-14 23:53:34 -0700 (Tue, 14 Jan 2014) | 14 lines
r28260 | kana.sugimoto | 2014-01-27 03:20:49 -0700 (Mon, 27 Jan 2014) | 17 lines
r28294 | kana.sugimoto | 2014-01-28 19:20:15 -0700 (Tue, 28 Jan 2014) | 14 lines
r28405 | wataru.kawasaki | 2014-02-04 00:50:58 -0700 (Tue, 04 Feb 2014) | 14 lines
r28447 | kana.sugimoto | 2014-02-06 00:02:48 -0700 (Thu, 06 Feb 2014) | 23 lines
r28448 | kana.sugimoto | 2014-02-06 02:46:42 -0700 (Thu, 06 Feb 2014) | 14 lines
r28493 | kana.sugimoto | 2014-02-10 04:12:11 -0700 (Mon, 10 Feb 2014) | 14 lines
r28525 | kana.sugimoto | 2014-02-12 20:26:12 -0700 (Wed, 12 Feb 2014) | 15 lines
r28553 | kana.sugimoto | 2014-02-17 00:35:50 -0700 (Mon, 17 Feb 2014) | 16 lines
r28558 | kana.sugimoto | 2014-02-17 22:19:11 -0700 (Mon, 17 Feb 2014) | 14 lines
r28561 | kana.sugimoto | 2014-02-18 01:04:44 -0700 (Tue, 18 Feb 2014) | 14 lines
r28562 | kana.sugimoto | 2014-02-18 01:19:03 -0700 (Tue, 18 Feb 2014) | 14 lines
r28590 | kana.sugimoto | 2014-02-19 21:31:44 -0700 (Wed, 19 Feb 2014) | 14 lines
r28591 | kana.sugimoto | 2014-02-19 21:48:09 -0700 (Wed, 19 Feb 2014) | 14 lines
r28593 | kana.sugimoto | 2014-02-19 22:13:06 -0700 (Wed, 19 Feb 2014) | 14 lines
r28594 | kana.sugimoto | 2014-02-19 22:48:50 -0700 (Wed, 19 Feb 2014) | 17 lines
r28618 | kana.sugimoto | 2014-02-21 01:04:23 -0700 (Fri, 21 Feb 2014) | 14 lines
r28620 | kana.sugimoto | 2014-02-21 02:22:58 -0700 (Fri, 21 Feb 2014) | 14 lines
r28621 | kana.sugimoto | 2014-02-21 02:38:54 -0700 (Fri, 21 Feb 2014) | 14 lines
r28636 | kana.sugimoto | 2014-02-23 21:05:21 -0700 (Sun, 23 Feb 2014) | 14 lines
r28654 | kana.sugimoto | 2014-02-25 01:53:45 -0700 (Tue, 25 Feb 2014) | 14 lines
r28663 | kana.sugimoto | 2014-02-25 22:53:44 -0700 (Tue, 25 Feb 2014) | 14 lines
r28664 | kana.sugimoto | 2014-02-25 22:57:02 -0700 (Tue, 25 Feb 2014) | 14 lines
r28667 | kana.sugimoto | 2014-02-26 00:18:30 -0700 (Wed, 26 Feb 2014) | 14 lines
r28668 | kana.sugimoto | 2014-02-26 00:21:34 -0700 (Wed, 26 Feb 2014) | 14 lines
r28670 | kana.sugimoto | 2014-02-26 01:02:30 -0700 (Wed, 26 Feb 2014) | 13 lines
r28684 | kana.sugimoto | 2014-02-26 20:08:02 -0700 (Wed, 26 Feb 2014) | 14 lines
r28712 | takeshi.nakazato | 2014-02-28 01:12:29 -0700 (Fri, 28 Feb 2014) | 16 lines
r28728 | takeshi.nakazato | 2014-03-02 18:55:58 -0700 (Sun, 02 Mar 2014) | 16 lines
r28729 | takeshi.nakazato | 2014-03-02 19:57:24 -0700 (Sun, 02 Mar 2014) | 16 lines
r28730 | takeshi.nakazato | 2014-03-02 21:47:56 -0700 (Sun, 02 Mar 2014) | 14 lines
r28731 | takeshi.nakazato | 2014-03-02 22:12:15 -0700 (Sun, 02 Mar 2014) | 14 lines
r28732 | takeshi.nakazato | 2014-03-02 22:26:08 -0700 (Sun, 02 Mar 2014) | 16 lines
r28733 | takeshi.nakazato | 2014-03-02 22:36:25 -0700 (Sun, 02 Mar 2014) | 14 lines
r28743 | kana.sugimoto | 2014-03-04 00:49:03 -0700 (Tue, 04 Mar 2014) | 14 lines
r28744 | takeshi.nakazato | 2014-03-04 01:35:15 -0700 (Tue, 04 Mar 2014) | 16 lines
r28755 | wataru.kawasaki | 2014-03-04 18:40:30 -0700 (Tue, 04 Mar 2014) | 14 lines
r28756 | wataru.kawasaki | 2014-03-04 23:00:29 -0700 (Tue, 04 Mar 2014) | 20 lines
r28759 | wataru.kawasaki | 2014-03-05 00:08:14 -0700 (Wed, 05 Mar 2014) | 14 lines
r28760 | wataru.kawasaki | 2014-03-05 01:33:47 -0700 (Wed, 05 Mar 2014) | 14 lines
r28775 | kana.sugimoto | 2014-03-06 00:19:03 -0700 (Thu, 06 Mar 2014) | 14 lines
r28776 | kana.sugimoto | 2014-03-06 00:21:29 -0700 (Thu, 06 Mar 2014) | 14 lines
r28777 | wataru.kawasaki | 2014-03-06 01:02:14 -0700 (Thu, 06 Mar 2014) | 14 lines
r28814 | wataru.kawasaki | 2014-03-11 01:34:21 -0600 (Tue, 11 Mar 2014) | 14 lines
r28996 | wataru.kawasaki | 2014-03-25 01:48:47 -0600 (Tue, 25 Mar 2014) | 14 lines
r29030 | wataru.kawasaki | 2014-03-26 19:30:27 -0600 (Wed, 26 Mar 2014) | 14 lines

// python/scripts/task_tsdaverage.py
// python/scripts/task_tsdfit.py   
// python/scripts/task_tsdmath.py 
// python/scripts/task_tsdstat.py
// python/scripts/task_tsdbaseline.py
// python/scripts/task_tsdflag.py  
// python/scripts/task_tsdplot.py
// python/scripts/task_tsdcal.py    
// python/scripts/task_tsdgrid.py   
// python/scripts/task_tsdreduce.py
// python/scripts/task_tsdcal2.py    
// python/scripts/task_tsdimaging.py
// python/scripts/task_tsdsave.py
// python/scripts/tests/test_tsdaverage.py
// python/scripts/tests/test_tsdfit.py   
// python/scripts/tests/test_tsdmath.py 
// python/scripts/tests/test_tsdstat.py
// python/scripts/tests/test_tsdbaseline.py
// python/scripts/tests/test_tsdflag.py  
// python/scripts/tests/test_tsdplot.py
// python/scripts/tests/test_tsdcal.py   
// python/scripts/tests/test_tsdgrid.py  
// python/scripts/tests/test_tsdreduce.py
// python/scripts/tests/test_tsdcal2.py   
// python/scripts/tests/test_tsdimaging.py
// python/scripts/tests/test_tsdsave.py
// python/scripts/tests/selection_syntax.py

r26962 | kana.sugimoto | 2013-10-23 02:23:31 -0600 (Wed, 23 Oct 2013) | 14 lines
r27340 | scott.rankin | 2013-11-14 11:37:09 -0700 (Thu, 14 Nov 2013) | 185 lines      // May be a merge from 4_2_0 to trunk and can be omitted. 
r27423 | scott.rankin | 2013-11-20 11:49:40 -0700 (Wed, 20 Nov 2013) | 39 lines      // May be a merge from 4_2_0 to trunk and can be omitted. 
r27562 | kana.sugimoto | 2013-12-02 20:24:52 -0700 (Mon, 02 Dec 2013) | 15 lines
r27599 | kana.sugimoto | 2013-12-05 00:33:38 -0700 (Thu, 05 Dec 2013) | 19 lines
r27601 | kana.sugimoto | 2013-12-05 03:00:03 -0700 (Thu, 05 Dec 2013) | 23 lines
r27629 | scott.rankin | 2013-12-06 11:32:58 -0700 (Fri, 06 Dec 2013) | 129 lines
r27729 | kana.sugimoto | 2013-12-16 00:05:04 -0700 (Mon, 16 Dec 2013) | 26 lines
r27746 | takeshi.nakazato | 2013-12-16 20:09:36 -0700 (Mon, 16 Dec 2013) | 18 lines
r27747 | takeshi.nakazato | 2013-12-16 22:30:23 -0700 (Mon, 16 Dec 2013) | 23 lines
r27748 | kana.sugimoto | 2013-12-16 22:54:00 -0700 (Mon, 16 Dec 2013) | 18 lines
r27765 | kana.sugimoto | 2013-12-17 22:48:36 -0700 (Tue, 17 Dec 2013) | 14 lines
r27822 | takeshi.nakazato | 2013-12-20 01:09:59 -0700 (Fri, 20 Dec 2013) | 16 lines
r27823 | kana.sugimoto | 2013-12-20 02:29:57 -0700 (Fri, 20 Dec 2013) | 17 lines
r27860 | takeshi.nakazato | 2013-12-23 19:07:31 -0700 (Mon, 23 Dec 2013) | 15 lines
r27861 | kana.sugimoto | 2013-12-23 20:08:27 -0700 (Mon, 23 Dec 2013) | 14 lines
r27862 | takeshi.nakazato | 2013-12-23 22:43:28 -0700 (Mon, 23 Dec 2013) | 17 lines
r27865 | takeshi.nakazato | 2013-12-23 23:19:44 -0700 (Mon, 23 Dec 2013) | 16 lines
r27866 | takeshi.nakazato | 2013-12-24 01:04:03 -0700 (Tue, 24 Dec 2013) | 16 lines
r27867 | kana.sugimoto | 2013-12-24 01:54:39 -0700 (Tue, 24 Dec 2013) | 16 lines
r27868 | kana.sugimoto | 2013-12-24 02:05:28 -0700 (Tue, 24 Dec 2013) | 14 lines
r27869 | takeshi.nakazato | 2013-12-24 18:23:08 -0700 (Tue, 24 Dec 2013) | 19 lines
r27871 | takeshi.nakazato | 2013-12-24 18:41:44 -0700 (Tue, 24 Dec 2013) | 17 lines
r27872 | takeshi.nakazato | 2013-12-24 19:10:51 -0700 (Tue, 24 Dec 2013) | 16 lines
r27873 | kana.sugimoto | 2013-12-24 21:49:34 -0700 (Tue, 24 Dec 2013) | 20 lines
r27876 | kana.sugimoto | 2013-12-24 23:01:00 -0700 (Tue, 24 Dec 2013) | 16 lines
r27877 | takeshi.nakazato | 2013-12-24 23:28:29 -0700 (Tue, 24 Dec 2013) | 23 lines
r27878 | takeshi.nakazato | 2013-12-24 23:41:38 -0700 (Tue, 24 Dec 2013) | 17 lines
r27879 | takeshi.nakazato | 2013-12-25 00:06:15 -0700 (Wed, 25 Dec 2013) | 16 lines
r27881 | kana.sugimoto | 2013-12-25 03:02:19 -0700 (Wed, 25 Dec 2013) | 14 lines
r27882 | kana.sugimoto | 2013-12-25 04:56:42 -0700 (Wed, 25 Dec 2013) | 17 lines
r27883 | kana.sugimoto | 2013-12-25 21:17:46 -0700 (Wed, 25 Dec 2013) | 14 lines
r27884 | kana.sugimoto | 2013-12-25 22:31:32 -0700 (Wed, 25 Dec 2013) | 14 lines
r27887 | kana.sugimoto | 2013-12-26 02:06:27 -0700 (Thu, 26 Dec 2013) | 14 lines
r27895 | kana.sugimoto | 2013-12-27 00:04:43 -0700 (Fri, 27 Dec 2013) | 16 lines
r27948 | kana.sugimoto | 2014-01-06 22:08:35 -0700 (Mon, 06 Jan 2014) | 26 lines
r28036 | wataru.kawasaki | 2014-01-14 00:14:00 -0700 (Tue, 14 Jan 2014) | 14 lines
r28062 | wataru.kawasaki | 2014-01-14 21:48:25 -0700 (Tue, 14 Jan 2014) | 14 lines
r28066 | wataru.kawasaki | 2014-01-14 23:50:08 -0700 (Tue, 14 Jan 2014) | 14 lines
r28067 | wataru.kawasaki | 2014-01-14 23:52:02 -0700 (Tue, 14 Jan 2014) | 14 lines
r28069 | wataru.kawasaki | 2014-01-15 00:27:40 -0700 (Wed, 15 Jan 2014) | 14 lines
r28086 | wataru.kawasaki | 2014-01-15 19:08:08 -0700 (Wed, 15 Jan 2014) | 14 lines
r28260 | kana.sugimoto | 2014-01-27 03:20:49 -0700 (Mon, 27 Jan 2014) | 17 lines
r28405 | wataru.kawasaki | 2014-02-04 00:50:58 -0700 (Tue, 04 Feb 2014) | 14 lines
r28447 | kana.sugimoto | 2014-02-06 00:02:48 -0700 (Thu, 06 Feb 2014) | 23 lines
r28493 | kana.sugimoto | 2014-02-10 04:12:11 -0700 (Mon, 10 Feb 2014) | 14 lines
r28525 | kana.sugimoto | 2014-02-12 20:26:12 -0700 (Wed, 12 Feb 2014) | 15 lines
r28534 | kana.sugimoto | 2014-02-13 21:07:49 -0700 (Thu, 13 Feb 2014) | 14 lines
r28553 | kana.sugimoto | 2014-02-17 00:35:50 -0700 (Mon, 17 Feb 2014) | 16 lines
r28558 | kana.sugimoto | 2014-02-17 22:19:11 -0700 (Mon, 17 Feb 2014) | 14 lines
r28590 | kana.sugimoto | 2014-02-19 21:31:44 -0700 (Wed, 19 Feb 2014) | 14 lines
r28591 | kana.sugimoto | 2014-02-19 21:48:09 -0700 (Wed, 19 Feb 2014) | 14 lines
r28593 | kana.sugimoto | 2014-02-19 22:13:06 -0700 (Wed, 19 Feb 2014) | 14 lines
r28594 | kana.sugimoto | 2014-02-19 22:48:50 -0700 (Wed, 19 Feb 2014) | 17 lines
r28597 | kana.sugimoto | 2014-02-19 23:39:18 -0700 (Wed, 19 Feb 2014) | 14 lines
r28598 | kana.sugimoto | 2014-02-19 23:59:09 -0700 (Wed, 19 Feb 2014) | 14 lines
r28617 | kana.sugimoto | 2014-02-21 01:01:26 -0700 (Fri, 21 Feb 2014) | 14 lines
r28619 | kana.sugimoto | 2014-02-21 02:20:24 -0700 (Fri, 21 Feb 2014) | 14 lines
r28654 | kana.sugimoto | 2014-02-25 01:53:45 -0700 (Tue, 25 Feb 2014) | 14 lines
r28662 | kana.sugimoto | 2014-02-25 21:09:01 -0700 (Tue, 25 Feb 2014) | 14 lines
r28689 | takeshi.nakazato | 2014-02-27 01:48:37 -0700 (Thu, 27 Feb 2014) | 16 lines
r28710 | takeshi.nakazato | 2014-02-28 00:28:20 -0700 (Fri, 28 Feb 2014) | 16 lines
r28711 | takeshi.nakazato | 2014-02-28 00:47:01 -0700 (Fri, 28 Feb 2014) | 16 lines
r28756 | wataru.kawasaki | 2014-03-04 23:00:29 -0700 (Tue, 04 Mar 2014) | 20 lines
r28771 | wataru.kawasaki | 2014-03-05 19:03:03 -0700 (Wed, 05 Mar 2014) | 14 lines
r28782 | kana.sugimoto | 2014-03-07 03:25:45 -0700 (Fri, 07 Mar 2014) | 14 lines
r28783 | kana.sugimoto | 2014-03-07 03:35:11 -0700 (Fri, 07 Mar 2014) | 17 lines
r28784 | kana.sugimoto | 2014-03-07 03:53:44 -0700 (Fri, 07 Mar 2014) | 14 lines
r28814 | wataru.kawasaki | 2014-03-11 01:34:21 -0600 (Tue, 11 Mar 2014) | 14 lines
r28867 | takeshi.nakazato | 2014-03-14 02:39:26 -0600 (Fri, 14 Mar 2014) | 16 lines
r28939 | takeshi.nakazato | 2014-03-20 01:14:03 -0600 (Thu, 20 Mar 2014) | 16 lines
r28968 | takeshi.nakazato | 2014-03-23 20:50:04 -0600 (Sun, 23 Mar 2014) | 16 lines
r28969 | takeshi.nakazato | 2014-03-23 20:50:59 -0600 (Sun, 23 Mar 2014) | 16 lines
r28970 | takeshi.nakazato | 2014-03-23 21:06:23 -0600 (Sun, 23 Mar 2014) | 16 lines
r28973 | takeshi.nakazato | 2014-03-23 23:16:34 -0600 (Sun, 23 Mar 2014) | 18 lines
r28974 | takeshi.nakazato | 2014-03-24 00:06:01 -0600 (Mon, 24 Mar 2014) | 15 lines
r28987 | takeshi.nakazato | 2014-03-24 19:54:55 -0600 (Mon, 24 Mar 2014) | 16 lines
r28988 | wataru.kawasaki | 2014-03-24 21:53:38 -0600 (Mon, 24 Mar 2014) | 14 lines
r28989 | kana.sugimoto | 2014-03-24 22:12:27 -0600 (Mon, 24 Mar 2014) | 14 lines
r28994 | wataru.kawasaki | 2014-03-25 01:10:24 -0600 (Tue, 25 Mar 2014) | 14 lines
r28995 | takeshi.nakazato | 2014-03-25 01:11:39 -0600 (Tue, 25 Mar 2014) | 17 lines
r28997 | kana.sugimoto | 2014-03-25 02:03:54 -0600 (Tue, 25 Mar 2014) | 14 lines
r29013 | kana.sugimoto | 2014-03-25 21:50:32 -0600 (Tue, 25 Mar 2014) | 14 lines
r29016 | takeshi.nakazato | 2014-03-26 00:14:51 -0600 (Wed, 26 Mar 2014) | 16 lines
r29017 | takeshi.nakazato | 2014-03-26 00:19:47 -0600 (Wed, 26 Mar 2014) | 16 lines
r29018 | takeshi.nakazato | 2014-03-26 00:29:48 -0600 (Wed, 26 Mar 2014) | 16 lines
r29019 | takeshi.nakazato | 2014-03-26 00:30:31 -0600 (Wed, 26 Mar 2014) | 16 lines
r29020 | kana.sugimoto | 2014-03-26 01:04:41 -0600 (Wed, 26 Mar 2014) | 14 lines
r29021 | kana.sugimoto | 2014-03-26 04:12:03 -0600 (Wed, 26 Mar 2014) | 14 lines
r29022 | kana.sugimoto | 2014-03-26 04:26:43 -0600 (Wed, 26 Mar 2014) | 14 lines
r29024 | kana.sugimoto | 2014-03-26 06:16:21 -0600 (Wed, 26 Mar 2014) | 14 lines
r29032 | kana.sugimoto | 2014-03-26 21:17:13 -0600 (Wed, 26 Mar 2014) | 14 lines
r29033 | kana.sugimoto | 2014-03-26 21:26:29 -0600 (Wed, 26 Mar 2014) | 14 lines
r29034 | kana.sugimoto | 2014-03-26 21:50:15 -0600 (Wed, 26 Mar 2014) | 14 lines
r29035 | kana.sugimoto | 2014-03-26 21:52:34 -0600 (Wed, 26 Mar 2014) | 14 lines
r29054 | takeshi.nakazato | 2014-03-28 02:42:13 -0600 (Fri, 28 Mar 2014) | 18 lines
r29109 | kana.sugimoto | 2014-04-01 23:49:17 -0600 (Tue, 01 Apr 2014) | 14 lines
r29110 | kana.sugimoto | 2014-04-01 23:52:46 -0600 (Tue, 01 Apr 2014) | 14 lines

// 2. Files that all commits to the codes after Sep 15, 2013 should be merged

// python/scripts/sdutil.py
// python/scripts/asap_init.py
// python/scripts/task_sdcoadd.py
// python/scripts/task_sdsave.py
// python/scripts/task_sdlist.py
// python/scripts/tests/test_sdcoadd.py
// python/scripts/tests/test_sdlist.py
// tasks/sdcoadd.xml
// tasks/sdsave.xml
// tasks/sdlist.xml
// tasks/sdflagmanager.xml
// tasks/sdimprocess.xml
// tasks/sdscale.xml
// tasks/sdtpimaging.xml
// tasks/sdmath.xml
// tasks/sdcal2.xml
// tasks/sdflag2.xml

r27211 | scott.rankin | 2013-11-06 16:21:01 -0700 (Wed, 06 Nov 2013) | 80 lines
r27257 | scott.rankin | 2013-11-08 11:38:17 -0700 (Fri, 08 Nov 2013) | 54 lines
r27340 | scott.rankin | 2013-11-14 11:37:09 -0700 (Thu, 14 Nov 2013) | 185 lines
r27354 | scott.rankin | 2013-11-15 10:59:30 -0700 (Fri, 15 Nov 2013) | 53 lines
r27423 | scott.rankin | 2013-11-20 11:49:40 -0700 (Wed, 20 Nov 2013) | 39 lines
r27562 | kana.sugimoto | 2013-12-02 20:24:52 -0700 (Mon, 02 Dec 2013) | 15 lines
r27600 | kana.sugimoto | 2013-12-05 02:32:10 -0700 (Thu, 05 Dec 2013) | 19 lines
r27630 | scott.rankin | 2013-12-06 11:34:49 -0700 (Fri, 06 Dec 2013) | 39 lines
r27645 | wataru.kawasaki | 2013-12-09 03:04:03 -0700 (Mon, 09 Dec 2013) | 14 lines
r27649 | wataru.kawasaki | 2013-12-09 18:51:17 -0700 (Mon, 09 Dec 2013) | 14 lines
r27729 | kana.sugimoto | 2013-12-16 00:05:04 -0700 (Mon, 16 Dec 2013) | 26 lines
r27731 | takeshi.nakazato | 2013-12-16 01:20:06 -0700 (Mon, 16 Dec 2013) | 18 lines
r27748 | kana.sugimoto | 2013-12-16 22:54:00 -0700 (Mon, 16 Dec 2013) | 18 lines
r27766 | kana.sugimoto | 2013-12-17 22:52:09 -0700 (Tue, 17 Dec 2013) | 14 lines
r27820 | takeshi.nakazato | 2013-12-20 01:06:45 -0700 (Fri, 20 Dec 2013) | 16 lines
r27821 | takeshi.nakazato | 2013-12-20 01:08:22 -0700 (Fri, 20 Dec 2013) | 16 lines
r27823 | kana.sugimoto | 2013-12-20 02:29:57 -0700 (Fri, 20 Dec 2013) | 17 lines
r27852 | scott.rankin | 2013-12-20 18:02:53 -0700 (Fri, 20 Dec 2013) | 105 lines
r27861 | kana.sugimoto | 2013-12-23 20:08:27 -0700 (Mon, 23 Dec 2013) | 14 lines
r27869 | takeshi.nakazato | 2013-12-24 18:23:08 -0700 (Tue, 24 Dec 2013) | 19 lines
r27870 | kana.sugimoto | 2013-12-24 18:35:01 -0700 (Tue, 24 Dec 2013) | 14 lines
r27873 | kana.sugimoto | 2013-12-24 21:49:34 -0700 (Tue, 24 Dec 2013) | 20 lines
r27877 | takeshi.nakazato | 2013-12-24 23:28:29 -0700 (Tue, 24 Dec 2013) | 23 lines
r27880 | kana.sugimoto | 2013-12-25 02:59:46 -0700 (Wed, 25 Dec 2013) | 13 lines
r27882 | kana.sugimoto | 2013-12-25 04:56:42 -0700 (Wed, 25 Dec 2013) | 17 lines
r27963 | scott.rankin | 2014-01-07 16:45:49 -0700 (Tue, 07 Jan 2014) | 62 lines
r28036 | wataru.kawasaki | 2014-01-14 00:14:00 -0700 (Tue, 14 Jan 2014) | 14 lines
r28067 | wataru.kawasaki | 2014-01-14 23:52:02 -0700 (Tue, 14 Jan 2014) | 14 lines
r28294 | kana.sugimoto | 2014-01-28 19:20:15 -0700 (Tue, 28 Jan 2014) | 14 lines
r28295 | shinnosuke.kawakami | 2014-01-28 19:47:32 -0700 (Tue, 28 Jan 2014) | 14 lines
r28296 | shinnosuke.kawakami | 2014-01-28 19:50:01 -0700 (Tue, 28 Jan 2014) | 14 lines
r28297 | shinnosuke.kawakami | 2014-01-28 19:51:40 -0700 (Tue, 28 Jan 2014) | 14 lines
r28405 | wataru.kawasaki | 2014-02-04 00:50:58 -0700 (Tue, 04 Feb 2014) | 14 lines
r28424 | wataru.kawasaki | 2014-02-04 19:40:41 -0700 (Tue, 04 Feb 2014) | 14 lines
r28447 | kana.sugimoto | 2014-02-06 00:02:48 -0700 (Thu, 06 Feb 2014) | 23 lines
r28493 | kana.sugimoto | 2014-02-10 04:12:11 -0700 (Mon, 10 Feb 2014) | 14 lines
r28524 | kana.sugimoto | 2014-02-12 20:09:11 -0700 (Wed, 12 Feb 2014) | 14 lines
r28525 | kana.sugimoto | 2014-02-12 20:26:12 -0700 (Wed, 12 Feb 2014) | 15 lines
r28662 | kana.sugimoto | 2014-02-25 21:09:01 -0700 (Tue, 25 Feb 2014) | 14 lines
r28683 | kana.sugimoto | 2014-02-26 20:04:52 -0700 (Wed, 26 Feb 2014) | 14 lines
r28712 | takeshi.nakazato | 2014-02-28 01:12:29 -0700 (Fri, 28 Feb 2014) | 16 lines
r28713 | takeshi.nakazato | 2014-02-28 01:34:29 -0700 (Fri, 28 Feb 2014) | 16 lines
r28714 | takeshi.nakazato | 2014-02-28 01:37:11 -0700 (Fri, 28 Feb 2014) | 16 lines
r28736 | takeshi.nakazato | 2014-03-02 23:13:57 -0700 (Sun, 02 Mar 2014) | 14 lines
r28761 | wataru.kawasaki | 2014-03-05 02:12:35 -0700 (Wed, 05 Mar 2014) | 14 lines
r28772 | shinnosuke.kawakami | 2014-03-05 22:45:03 -0700 (Wed, 05 Mar 2014) | 14 lines
r28777 | wataru.kawasaki | 2014-03-06 01:02:14 -0700 (Thu, 06 Mar 2014) | 14 lines
r28810 | takeshi.nakazato | 2014-03-10 21:19:11 -0600 (Mon, 10 Mar 2014) | 16 lines
r28832 | takeshi.nakazato | 2014-03-11 19:26:07 -0600 (Tue, 11 Mar 2014) | 17 lines
r28833 | takeshi.nakazato | 2014-03-11 19:31:39 -0600 (Tue, 11 Mar 2014) | 16 lines
r28838 | takeshi.nakazato | 2014-03-11 23:46:07 -0600 (Tue, 11 Mar 2014) | 17 lines
r28854 | takeshi.nakazato | 2014-03-12 21:00:38 -0600 (Wed, 12 Mar 2014) | 16 lines
r28855 | takeshi.nakazato | 2014-03-12 21:37:40 -0600 (Wed, 12 Mar 2014) | 15 lines
r28858 | takeshi.nakazato | 2014-03-13 00:30:18 -0600 (Thu, 13 Mar 2014) | 16 lines
r28859 | takeshi.nakazato | 2014-03-13 00:57:12 -0600 (Thu, 13 Mar 2014) | 16 lines
r28986 | takeshi.nakazato | 2014-03-24 19:00:26 -0600 (Mon, 24 Mar 2014) | 16 lines

// 3. Files with selected revisions to be merged
//  python/CMakeLists.txt: 

r27599
r27729
r27746
r27823
r27866
r27872
r27873
r27948
r28036
r28068
r28447
r28525

// python/scripts/tests/CMakeLists.txt: 

r27599
r27729
r27746
r27823
r27869
r27873
r27877
r28062
r28066
r28069
r28086
r28260
r28447
r28525
r28689

// tasks/CMakeLists.txt: 

r27599
r27729
r27746
r27823
r27866
r27872
r27873
r27948
r28036
r28068
r28447
r28525

// python/scripts/regressions/admin/testwrapper.py: 

r28690

// 4. Revisions in trunk that should be merged to 4_2_2 branch

r27562 
r27553

[casacore]
none

[code]
none

// Additional revisions requested on 4/18/14: 

[casa-data]
r9559, r9562, r9573, r9576, r9582, r9591, r9596, r9597, r9605, r9614, r9620, r9621, r9648, r9389, r9617, r9615, r9579, r9389, r9134, r9677, r9639, r9616, r9578, r9655, r9664, r9640, r9654, r9561, r9560, r9209, r9208, r9194, r9162, r9643, r9218

[asap]
r2926, 
r2928, r2927, r2925, r2924, r2923, r2922, r2921, r2920, r2919, r2918

[gcwrap]
r29192, r29193,
r29316, r29270, r29269, r29267, r29266, r29260, r29259, r29256, r29244, r29243, r29239, r29219, r29189, 
r29350, r29236, r29234, r29194, r29188, r29187, r29174, r29171, 
r29331, r29313, r29312, r29305, r29304, r29271, r29221

// MERGE WITH CARE
// See comments from Kana in e-mail dated 4/18/14
r29367, r29369

// Additional revisions requested on 5/2/14:

[asap]
r2931, r2932, r2933, r2934, r2935, r2936, r2937, r2938

[casa-data]
r9736, r9732

[gcwrap]
r29544, r29543, r29454, r29449, r29448, 
r29503, r29501, r29497, r29446, r29443, r29442, 
r29517, r29516, r29505, r29504, r29502, r29496, r29495, r29471, 
r29452, r29451, r29450, r29423, r29404

// The following commit is corresponding to Dave's change to ia.getchunck(). I don't know if it would be in 4.2.2.
// r29468 (Note from RS: Not included in 4.2.2 release, but left in here for context)


-- RobSelina - 2014-04-03
Topic revision: r5 - 2014-05-02, RobSelina
This site is powered by FoswikiCopyright © by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding NRAO Public Wiki? Send feedback