Commit graph

11493 commits

Author SHA1 Message Date
Ana Rivera
385d13205c Merge branch 'master_14.3.4'(master_14.3.4-2) into tcv_14.3.4
Change-Id: I9919f04e6f9022393cff6f46d342dbce0225ffde

Former-commit-id: 11d09194057a4b0b69d866aea16fe85f8390f9c7
2015-06-01 14:19:33 +00:00
Ron Anderson
7bceddcf07 Omaha #4522 Fix issue with 000 UGCs
Change-Id: Ie1ed615ba3d8dc3ae9e241ae05524093d740b324

Former-commit-id: c5e67c62fcddeb59f1fb58dfa35d9ae32b8f2280
2015-06-01 09:09:22 -05:00
Fay.Liang
897194214e Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 6c8e5f9fba2f3f080287da9931dcbe1dee2545c6
2015-06-01 08:59:15 -04:00
Fay.Liang
27043f6fb7 Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into int_15.1.1
Former-commit-id: f2b3a2fc2c1a5362673fed5b4841cd6d5d86ea5d
2015-05-29 15:43:59 -04:00
Fay.Liang
3a354bf7fb Merge tag 'OB_14.4.1-47' into int_15.1.1
14.4.1-47

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 602505383d4a1ec8a2cea08f94b7350cabae39b7
2015-05-29 15:42:40 -04:00
Ron Anderson
2d411c8063 Omaha #4522 Fix a problem with non-unique updates.
Change-Id: If3ed4f6db506d867ceee037ddf37ac0d3716955a

Former-commit-id: 67a4cf1672de7ece87ff50d3b3d054ec80e81031
2015-05-29 13:32:38 -05:00
Fay.Liang
26f42fe2d1 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 7320fd04ef [formerly 964d31a624 [formerly 67eb69bf76f89f7841c578683e82de6c3ddfcd1b]]
Former-commit-id: 964d31a624
Former-commit-id: 93c8f54b4b
2015-05-29 10:49:30 -04:00
Fay.Liang
964d31a624 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 67eb69bf76f89f7841c578683e82de6c3ddfcd1b
2015-05-29 10:49:30 -04:00
Fay.Liang
c2e75f305b Merge tag 'OB_14.3.4-3' into master_14.4.1
14.3.4-3


Former-commit-id: 065c9ac4ce [formerly c1166790f4 [formerly 0313242112db9c9e70e6692c1c31816b0f3432d3]]
Former-commit-id: c1166790f4
Former-commit-id: 99adcdaac4
2015-05-29 10:43:59 -04:00
Fay.Liang
c1166790f4 Merge tag 'OB_14.3.4-3' into master_14.4.1
14.3.4-3


Former-commit-id: 0313242112db9c9e70e6692c1c31816b0f3432d3
2015-05-29 10:43:59 -04:00
Fay.Liang
cab1ea9f60 Merge branch 'tcv_14.3.4' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.4
Former-commit-id: f89b10d668 [formerly c31ba8cc50 [formerly cbc4c0821a4a87299904755c0aceb1176a8c4370]]
Former-commit-id: c31ba8cc50
Former-commit-id: 76f6fd22e6
2015-05-29 09:45:45 -04:00
Fay.Liang
c31ba8cc50 Merge branch 'tcv_14.3.4' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.4
Former-commit-id: cbc4c0821a4a87299904755c0aceb1176a8c4370
2015-05-29 09:45:45 -04:00
Rici.Yu
b9508d54c0 ASM #17496 - Additional missed changes for Wave8-10
Change-Id: I030ecd872f98b2e12b7739c38d31739c56323188

Former-commit-id: 1627eb1a42 [formerly a426e0e626 [formerly 975455c7a98e8b21f1bcd3def6db04d2f6b1e67d]]
Former-commit-id: a426e0e626
Former-commit-id: 5e4c22117a
2015-05-29 09:36:31 -04:00
Rici.Yu
a426e0e626 ASM #17496 - Additional missed changes for Wave8-10
Change-Id: I030ecd872f98b2e12b7739c38d31739c56323188

Former-commit-id: 975455c7a98e8b21f1bcd3def6db04d2f6b1e67d
2015-05-29 09:36:31 -04:00
Ana Rivera
9861e27263 VLab Issue #8121 - DR17405 NWPS:Suppress diagnostic banner messages; fixes #8121
Change-Id: I464af54151ba8a80c5adbbe44deb52d210931490

Former-commit-id: e6b54b462c0088b02b3666c004e4209649ed2881
2015-05-29 13:08:04 +00:00
Rici.Yu
42ab0bde28 ASM #17496 - check in changes proposed in MFR TT688921 and authorized by gov
Change-Id: Ie85827ac4a248a7f5696ed407cfc2855a682e958

Former-commit-id: d51109857e [formerly 2010c8870a [formerly 1db748040b3a51c781668420cb018974f0b50535]]
Former-commit-id: 2010c8870a
Former-commit-id: f4c46752ed
2015-05-28 13:48:10 -04:00
Rici.Yu
2010c8870a ASM #17496 - check in changes proposed in MFR TT688921 and authorized by gov
Change-Id: Ie85827ac4a248a7f5696ed407cfc2855a682e958

Former-commit-id: 1db748040b3a51c781668420cb018974f0b50535
2015-05-28 13:48:10 -04:00
Sarah Pontius
8575aed094 VLab Issue #8327 - Issue with HLS if storm is stationary; fixes #8327
Change-Id: I92d26a9b7c5cde54dd42b911bfc3bf68d9e60288

Former-commit-id: cefbbce1d3 [formerly 3d42a79911 [formerly c399d95d34f8ce74263d736158e980a0c97836e2]]
Former-commit-id: 3d42a79911
Former-commit-id: 9a292f69b2
2015-05-28 07:57:58 -06:00
Sarah Pontius
3d42a79911 VLab Issue #8327 - Issue with HLS if storm is stationary; fixes #8327
Change-Id: I92d26a9b7c5cde54dd42b911bfc3bf68d9e60288

Former-commit-id: c399d95d34f8ce74263d736158e980a0c97836e2
2015-05-28 07:57:58 -06:00
Ron Anderson
f7d30d71bd Omaha #4522 Add proper primary key to active table
Change-Id: Id1c6f4ce0b317211e3a1eed0240f2463bd842f40

Former-commit-id: 99243fee7951395b37730327a19c6391832cbc36
2015-05-27 13:56:14 -05:00
Steve Harris
5aeeecffc7 Merge tag 'OB_14.4.1-44' into omaha_14.4.1
14.4.1-44


Former-commit-id: 01b7db1794 [formerly 5fafbd51e5 [formerly fff199787b5e69cb8a0b0c28e5ac3a483500bd44]]
Former-commit-id: 5fafbd51e5
Former-commit-id: 7ba7ad7694
2015-05-26 16:07:24 -05:00
Steve Harris
5fafbd51e5 Merge tag 'OB_14.4.1-44' into omaha_14.4.1
14.4.1-44


Former-commit-id: fff199787b5e69cb8a0b0c28e5ac3a483500bd44
2015-05-26 16:07:24 -05:00
Mark Peters
07b1e1ae47 Omaha #4525 Incorrect Unit Conversion for MSLP
Change-Id: Ice48df4e0bf67e2b75f8804707a99e9feab2c53b

Former-commit-id: 8f01720f50 [formerly 750f5efb93 [formerly fbe232d6c4177a9db7afafa5aa4f9031dc14d49b]]
Former-commit-id: 750f5efb93
Former-commit-id: 31b6dad2cc
2015-05-26 14:15:01 -05:00
Mark Peters
750f5efb93 Omaha #4525 Incorrect Unit Conversion for MSLP
Change-Id: Ice48df4e0bf67e2b75f8804707a99e9feab2c53b

Former-commit-id: fbe232d6c4177a9db7afafa5aa4f9031dc14d49b
2015-05-26 14:15:01 -05:00
Fay.Liang
c1f576d374 Merge tag 'OB_14.3.4-2' into master_14.4.1
14.3.4-2


Former-commit-id: 78e5fba897 [formerly 9e651a81c3 [formerly ab0f58ebd6b4ce61525b1ec768fb6b293098cd91]]
Former-commit-id: 9e651a81c3
Former-commit-id: cacdfc2c5f
2015-05-22 14:52:28 -04:00
Fay.Liang
9e651a81c3 Merge tag 'OB_14.3.4-2' into master_14.4.1
14.3.4-2


Former-commit-id: ab0f58ebd6b4ce61525b1ec768fb6b293098cd91
2015-05-22 14:52:28 -04:00
Fay.Liang
bb0b1b0b67 Merge branch 'tcv_14.3.4' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.4
Former-commit-id: 3524773132 [formerly e0629c3f7b [formerly a381e2a184cb2096237abfe4156fb96126e5d7ef]]
Former-commit-id: e0629c3f7b
Former-commit-id: dbfb935ec4
2015-05-22 14:02:53 -04:00
Fay.Liang
e0629c3f7b Merge branch 'tcv_14.3.4' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.4
Former-commit-id: a381e2a184cb2096237abfe4156fb96126e5d7ef
2015-05-22 14:02:53 -04:00
Ana Rivera
78a7978ffa VLab Issue #8325 - DR17502 WFO TCV can fail due to InundationMax and InundationTiming differences; fixes #8325
Change-Id: I363f2bdb7694a504ac907ee0e99f06712d314c0b

Former-commit-id: 0d176d661f [formerly 33a5f527fb [formerly ed825a5536074139ad20d83d0f34ac667a33f516]]
Former-commit-id: 33a5f527fb
Former-commit-id: b88444559c
2015-05-22 15:58:50 +00:00
Ana Rivera
33a5f527fb VLab Issue #8325 - DR17502 WFO TCV can fail due to InundationMax and InundationTiming differences; fixes #8325
Change-Id: I363f2bdb7694a504ac907ee0e99f06712d314c0b

Former-commit-id: ed825a5536074139ad20d83d0f34ac667a33f516
2015-05-22 15:58:50 +00:00
Sarah Pontius
c0de25ff34 VLab Issue #8327 - Issue with HLS if storm is stationary; fixes #8327
Change-Id: I54d0740a09530a026565fc5ee13c7fa82e29ab20

Former-commit-id: 0766392b54 [formerly f30c30c494 [formerly 241aadab209b03647f761115958e0628b2611794]]
Former-commit-id: f30c30c494
Former-commit-id: 45f4652513
2015-05-21 15:51:38 -06:00
Sarah Pontius
f30c30c494 VLab Issue #8327 - Issue with HLS if storm is stationary; fixes #8327
Change-Id: I54d0740a09530a026565fc5ee13c7fa82e29ab20

Former-commit-id: 241aadab209b03647f761115958e0628b2611794
2015-05-21 15:51:38 -06:00
David Gillingham
08ad47c82e Omaha #4518: ISC_Send_Area is always at least a union of ISC and FireWXAOR edit areas.
Change-Id: I3fd34061832341fe8a528f4c9d49ac18c19f3661

Former-commit-id: 2e07ebe8efcd10fc7ad0878b9c2564a62cc37b49
2015-05-21 15:01:03 -05:00
Fay.Liang
2f6c1b20d1 Merge tag 'OB_14.3.4-1' into master_14.4.1
14.3.4-1


Former-commit-id: 765314b286 [formerly 1fd568dc33 [formerly eef689433b22c30462372f95aab8eedac80265ff]]
Former-commit-id: 1fd568dc33
Former-commit-id: fcbd4f36c1
2015-05-21 08:48:15 -04:00
Fay.Liang
1fd568dc33 Merge tag 'OB_14.3.4-1' into master_14.4.1
14.3.4-1


Former-commit-id: eef689433b22c30462372f95aab8eedac80265ff
2015-05-21 08:48:15 -04:00
Ron Anderson
b47ada316f Issue #4511 Add permissions for ALL to write to cave_static/site/gfe/tcvAdvisories so anyone can run the Hazard_TCV formatter
Change-Id: Icf508913c78b1fb199504ec8ebc8d414e0a0636d

Former-commit-id: b4c1cdce4c [formerly 1fdc5b02be [formerly a4b261774687b947d14a51305a7032cbe5bcc8f7]]
Former-commit-id: 1fdc5b02be
Former-commit-id: f1b59e77f2
2015-05-20 14:15:13 -05:00
Ron Anderson
1fdc5b02be Issue #4511 Add permissions for ALL to write to cave_static/site/gfe/tcvAdvisories so anyone can run the Hazard_TCV formatter
Change-Id: Icf508913c78b1fb199504ec8ebc8d414e0a0636d

Former-commit-id: a4b261774687b947d14a51305a7032cbe5bcc8f7
2015-05-20 14:15:13 -05:00
Steve Harris
090c3102f8 Merge tag 'OB_15.1.1-12' into omaha_15.1.1
15.1.1-12


Former-commit-id: 31ae0154fe4ad36aefb84f0210ce72172a31a9c2
2015-05-19 17:00:31 -05:00
Ron Anderson
9ba314bd1b Issue #4503 Fix nwrwaves trigger in TPCWatchSrv to only trigger on non-national TCV/HLS products
Change-Id: Iaaae5a35b94fd0c4edacd3d23e5913de9faf7f26

Former-commit-id: ff46482c6b [formerly 24d5e05d91 [formerly 268605b812cfd76c6b88a85226c1b018c9ba7034]]
Former-commit-id: 24d5e05d91
Former-commit-id: a688146166
2015-05-19 15:42:55 -05:00
Ron Anderson
24d5e05d91 Issue #4503 Fix nwrwaves trigger in TPCWatchSrv to only trigger on non-national TCV/HLS products
Change-Id: Iaaae5a35b94fd0c4edacd3d23e5913de9faf7f26

Former-commit-id: 268605b812cfd76c6b88a85226c1b018c9ba7034
2015-05-19 15:42:55 -05:00
Ron Anderson
c645c4ea7d Omaha #4027 Fix Hazard_AQA formatter
Change-Id: I0ac47efce8c3023f1ddbcaefc1bcb7538cca5224

Former-commit-id: 56020a1ae788746f4a40c43d8478334a171706af
2015-05-14 17:44:14 -05:00
Ron Anderson
2304e45d74 Omaha #4027 Changes to match draft mixed case guidelines from Phase I
Change-Id: I2af2a2742f99c8a97976cafd451057b7e7137efe

Former-commit-id: b9d9063e56939b558eee3f64b65ddc28f6478c38
2015-05-14 14:58:07 -05:00
Fay.Liang
6e3b05f1ec Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into int_15.1.1
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/WatchUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: a282c0b3fac70f99abd8f734771fc8805d8b8a13
2015-05-14 14:05:04 -04:00
Fay.Liang
fbe6c3ff54 Merge branch 'mdl_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into int_15.1.1
Former-commit-id: 3dbd8b5a06aa96adbbfdfb25600527a15bfe011a
2015-05-14 13:58:44 -04:00
Kenneth Sperow
3021219915 VLab Issue #8185. Include JFreeChart into AWIPS2.
Former-commit-id: d5480d6c067eef6c14a46c37f8cbb381964780d5
2015-05-14 08:40:31 -07:00
Bruce.Hundermark
ca74bf8355 ASM #14920 - GFE: SmartInits not calculating 12hr PoP correctly
Change-Id: Ie4d463d005aedb15ccbfb1f17835b57e65fd1264

Former-commit-id: 1f1252ed08512c78ec1cab03dfb7929d51408430
2015-05-14 14:20:35 +00:00
Fay.Liang
a2f42a667f Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: ab0463196e [formerly d7b97885b9 [formerly 6ed022aa9af53df391b32a295d6560c9f55750f2]]
Former-commit-id: d7b97885b9
Former-commit-id: 50555e22fe
2015-05-13 23:06:56 -04:00
Fay.Liang
d7b97885b9 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 6ed022aa9af53df391b32a295d6560c9f55750f2
2015-05-13 23:06:56 -04:00
Matthew Howard
d110a520e0 Merge "ASM #17144 - GFE: Add Capabilities for CONUS real-Time Mesoscale Analysis at 2.5km" into asm_15.1.1
Former-commit-id: bd6bd016eca0339221e47c3d113deeaf5fcbb2c9
2015-05-13 15:41:33 -05:00
Ana Rivera
76bc52e652 VLab Issue #8178 - NWPS: serverConfig fix for Great Lakes; fixes; #8178
Change-Id: I31af422aa9db81366eec58082f43691e6a1424d8

Former-commit-id: b0c829baf1 [formerly 3a266cd5d4 [formerly a63ed7e729a11be90fd02382b5e120df9da7b438]]
Former-commit-id: 3a266cd5d4
Former-commit-id: 4ee68d9b86
2015-05-13 20:28:37 +00:00