Brian.Dyke
|
1018c65552
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 41a854146a3f4ab156b63e2ea24e60681fc586f2
|
2014-09-19 16:59:12 -04:00 |
|
Baoyu Yin
|
28b7e8d6e2
|
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen IBW templates and 14.2.1 template corrections; fixes #4796
Change-Id: Ieb4a6d68b48351deacbddda65f1ff53485c3402d
Former-commit-id: f077d3cd4084faf8ad7c8865e84df53e59a5db72
|
2014-09-19 15:02:23 -04:00 |
|
Brian.Dyke
|
14e64881a1
|
Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
Former-commit-id: bc9f03426304e3bb194fbf7f356d8dd3816cd836
|
2014-09-02 16:32:54 -04:00 |
|
David Friedman
|
ea9230b37c
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: 6bfa1d6662b00925814be7126592bbe340651649
|
2014-08-28 15:43:32 +00:00 |
|
Fay.Liang
|
77a6ab632f
|
ASM #600 - the fixes for DR 17380
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
Former-commit-id: 89c29c1228830d301b7046ebb7d4281666c2b768
|
2014-08-15 11:03:15 -05:00 |
|
Brian.Dyke
|
270d2b0ddb
|
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: b209604e1f0d6e790980d0bc8f1760e38f448076
|
2014-08-04 13:10:13 -04:00 |
|
Jonathan Sanchez
|
b991838494
|
Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: 135d7ffa84af58d7b3c9575e654fa1298b76b2e2
|
2014-07-22 15:32:12 -05:00 |
|
Fay.Liang
|
f56d9511b8
|
ASM #600 - the fixes for DR 17380
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a
Former-commit-id: 445239c00cbe2147c014e180570085be6224da79
|
2014-05-27 16:04:22 -04:00 |
|
Brian.Dyke
|
dad6f2896b
|
Issue #224
Former-commit-id: 043faa447b4fc15a996dfe6108093bed5f1b6497
|
2014-02-04 17:05:12 -05:00 |
|
Richard Peter
|
f4e71b65d3
|
Merge branch 'omaha_13.5.3' (13.5.2-7) into development
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
Change-Id: Ie8cbc10d06805616c05a5d5b52cd725a56f9cf50
Former-commit-id: 724a8c87ab8aa880dab45a0a743c3b9d6ace4e2e
|
2013-10-01 15:06:34 -05:00 |
|
Richard Peter
|
c6386e306f
|
Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
rpms/awips2.cave/deploy.builder/build.sh
Former-commit-id: 293586df88f53c2ddf6f7586bf71719298728022
|
2013-07-22 09:40:18 -05:00 |
|
Nate Jensen
|
b767760a9c
|
Issue #2032 move build.edex's common-static files to appropriate plugins
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15
Former-commit-id: e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2
|
2013-07-18 09:53:53 -05:00 |
|