Commit graph

8004 commits

Author SHA1 Message Date
cmadmin
e6c66c93d3 Merge "Omaha #4200 - Update Shapely to v1.4.4" into omaha_14.4.1
Former-commit-id: a4ea977b9609c1d12f874b1abe3158f7aeb985f1
2015-03-04 11:59:25 -06:00
David Gillingham
07805e808c Omaha #4128: Ensure active table sharing is configured before enabling it.
Change-Id: Ib42a251f5d9c134da7ba484582ce60d653a06937

Former-commit-id: 3ebb60db47fc74a77eea56ae7738b5f7b405fb19
2015-03-03 16:46:39 -06:00
Greg Armendariz
031d63b6fc Omaha #4200 - Update Shapely to v1.4.4
Former-commit-id: c5b543725c87e17d4899f66f5f2b1ea76a4c5ac9
2015-03-03 16:05:47 -06:00
Ron Anderson
9648dbc550 Merge "Omaha #4128: Move FetchActiveTableSrv to edex.gfe plugin, fix cluster failover of service." into omaha_14.4.1
Former-commit-id: 3ccb7a96f716bf5cd829a8f34a93dbc6744f3d1b
2015-03-03 15:59:42 -06:00
steve.naples
3ecaf0c634 ASM #15660 Fixed issues with saving disagg data.
Change-Id: I6f0e8b02b7035e9d9614c52718026fce81b2e331

Former-commit-id: 4646f7396153651359624f3dd12660810fe2bf6e
2015-03-03 21:02:54 +00:00
Fay.Liang
f00b3d3156 Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: c91a37257cd2882047e79200f624acc1e0312cba
2015-03-03 14:44:31 -05:00
Fay.Liang
8bfe8fb65f Merge branch 'master_14.3.1.1' into master_14.3.2
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 5aa2c444583d03b442768a8e9ea462877a25bb8d
2015-03-03 14:26:22 -05:00
Ana Rivera
2b9a2ae753 Merge branch 'master_14.4.1'(14.4.1-14m) into gsd_14.4.1
Change-Id: Ia28b2274f55845670f44f60a5d5251a013832c0d

Former-commit-id: 6f8aafe588c13769a1c322436c594e3effcea3ff
2015-03-03 16:20:25 +00:00
Juliya Dynina
cc0d8eaf8a Merge "ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable." into asm_14.4.1
Former-commit-id: dd529eadfb006ff48cc975ae7926c06bf952f271
2015-03-03 09:55:58 -05:00
Michael Gamazaychikov
6897cfd7b9 ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
Change-Id: I5772661758a26c47019c3939ceff73ca0eb6f50e

Former-commit-id: ab0f7f0f627ab3926a219940f1267dc460e74e14
2015-03-03 09:38:34 -05:00
Ana Rivera
9fb3b29048 Merge "VLab Issue #6517 - TCMWindTool Fix; fixes #6517" into tcv_14.3.2
Former-commit-id: 7746c8ce24f444d0d9b480e756d092b482e7428a
2015-03-02 22:19:14 +00:00
cmadmin
58cb5d45be Merge "Omaha #3299 - Remove fits plugin from awips2-edex-cots feature" into omaha_14.4.1
Former-commit-id: c0686acd33a35fdbca17dcc0255826a0e10c74d8
2015-03-02 14:12:07 -06:00
Greg Armendariz
07c51b71bf Omaha #3299 - Remove fits plugin from awips2-edex-cots feature
Former-commit-id: 4ddbeaba11bab77ece13ee46e89d34f141619701
2015-03-02 13:11:44 -06:00
Joshua Watson
7fc4a6f2ae VLab Issue #6684 - Fixed parameter abbrev in derived parameter CONVP2hr.xml and fixed grib table entry in grib/tables/7/14/4.2.0.19.table; fixes #6684
Change-Id: Ibcfe705b56cc4112da732c46eb17d52f9a4a6df7

Former-commit-id: 5a0b0653e28f31a080eec2123386359691c4b1fd
2015-03-02 12:10:07 -05:00
Steven Harris
84804cf7c6 Merge tag 'OB_14.4.1-14m' into omaha_14.4.1
14.4.1-14


Former-commit-id: bf4f8eca3dfd48957a84a8594ea6aa02b77dc700
2015-03-02 09:25:54 -06:00
Fay.Liang
185feac0e0 Merge branch 'asm_14.3.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1.1
Former-commit-id: f07eab6e1ccf6737cb90dc9af5ac247807124158
2015-03-02 09:29:39 -05:00
Qinglu.Lin
cf66bb11f3 ASM #17169: WarnGen Templates: IBW marine CTA and impact updates
Change-Id: I59e000340b6a82dc439128f3ad6963476b669344

Former-commit-id: 441be68f8726618225b0c7a5077443b8a7815d99
2015-02-27 16:10:22 -05:00
Shawn.Hooper
ef3fe69c5f ASM #17172 - Update heap size to 1536M for 14.3.1.1 64-bit
Change-Id: Iea8841e91a5d4ea005fecd0e89cd55d67319db1c

Former-commit-id: c96e25664a8ef82f33bbad3ea82efad90024baee
2015-02-27 14:17:34 -05:00
Ron Anderson
a4fea90f17 Omaha #4126 Ensure transmit is properly cancelled if dialog is closed
Change-Id: I259089abc4f4c9ce5cdfb80892273f7c0dd1ec65

Former-commit-id: 781b6d4f32ec8e9d34d746db72aebab4d4153c56
2015-02-27 12:29:22 -06:00
Ron Anderson
25dab5d8ca Merge "Omaha #3299 - Remove features" into omaha_14.4.1
Former-commit-id: 7af54abd5e920241bc6f389f5b3010794c498605
2015-02-27 09:44:44 -06:00
Greg Armendariz
dc4cc9e7c7 Omaha #3299 - Remove features
Change-Id: Icb1583b2f0a7bd165034714826c5c43ff7bf88b7

Former-commit-id: 504cf2eb9598364f7f2717dafe93f54bd8f2187d
2015-02-27 09:37:25 -06:00
Ana Rivera
cb05d85286 Merge branch 'master_14.4.1' (OB_14.4.1-13m) into gsd_14.4.1
Conflicts:
	gsd/gov.noaa.gsd.viz.ensemble/src/gov/noaa/gsd/viz/ensemble/display/control/EnsembleToolDisplayCustomizer.java
	gsd/gov.noaa.gsd.viz.ensemble/src/gov/noaa/gsd/viz/ensemble/navigator/ui/viewer/EnsembleToolViewer.java

Change-Id: I407b17ca164c752a7d90d407862923ae0f4bf5c0

Former-commit-id: ea254b8234504a2f8a2fa9f4c73328d421a3ac8c
2015-02-27 15:13:46 +00:00
Richard Peter
cc3d526f60 Omaha #3353 - Fix warngen geometry generation blocking cave
Change-Id: I3c29747e0d9f0f265fbdab4e152b1739c42e26d0

Former-commit-id: 62410b8ce728440326997eab37a37a9650e51223
2015-02-26 16:45:18 -06:00
David Gillingham
d7c0000508 Omaha #4128: Move FetchActiveTableSrv to edex.gfe plugin, fix cluster failover of service.
Change-Id: I99132eb075f3ccf4dd8b679d61c992e7029e1a31

Former-commit-id: 5d962bf6cf7a3e40ee152bc98817daf116633f60
2015-02-26 15:57:47 -06:00
Greg Armendariz
7539d84bba Omaha #3299 - Add back correct jars, update deploy-install to search for plugins in optionaldirectories
Change-Id: I5aebad06117f7072d322b8d7cbfe4a14acc2fdf8

Former-commit-id: 3a09dc91fbeb7db16a99116ad2582932e3fd6e58
2015-02-26 14:03:17 -06:00
Fay.Liang
fa65e0ecc9 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: f784dc11199f557d0bd39181d3e55bfa2b06a42a
2015-02-26 13:41:37 -05:00
Fay.Liang
ba56127604 Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 4e3fc06b752911badc86f6a1b72ad177863378ed
2015-02-26 13:36:56 -05:00
Shawn.Hooper
264a1a0274 Merge "ASM #17175 - Increase the JVM heap size to 2560M for I-met client" into asm_14.4.1
Former-commit-id: 0a2dce294e4dc37b10fc08ee2ca6cee9efaee4df
2015-02-26 13:23:51 -05:00
Shawn.Hooper
b5224e393c ASM #17175 - Increase the JVM heap size to 2560M for I-met client
Change-Id: I88c6a9a40b2145d9dd013b7c78d22af57fd7d987

Former-commit-id: cdc6bacc3b8b162a90b0ec8921b6805d77bccf23
2015-02-26 13:18:14 -05:00
Shawn.Hooper
fb99c62e1a ASM #17168 - Add directory/files needed to create new decoderpostprocessor rpm
Change-Id: Id0cd2a97147cfb1a041e8b09ed155dafd67b1256

Former-commit-id: b67527007223dd0fbb2a6c5c17ef7fb6a68b2410
2015-02-26 13:15:17 -05:00
Nate Jensen
601df7e202 Merge "Omaha #3299 - Updated deploy-install to find features" into omaha_14.4.1
Former-commit-id: 338968eebfe41680949dc39b60696e2fdc9f96c1
2015-02-26 09:28:55 -06:00
Richard Peter
b0fba55588 Omaha #3353 - Fix warngen sync blocks on geospatial data.
Change-Id: I3d596030d4a06eb3e9cc8fbffa15ce5c596ed8ac

Former-commit-id: 4df7c51d45ca960f364d9b0a626e8ec1fd0c325c
2015-02-25 20:00:19 -06:00
Mark Peters
a037243fee Omaha #4154 Null pointer when trying to add a contact notifier in collaboration
Change-Id: Ie291a4638e5a82a45f5d8a7a46c80604997dea89

Former-commit-id: ade10f507637a6cc9689fd020d9bf5f98270b53c
2015-02-25 16:24:38 -06:00
Sarah Pontius
8463da45e6 VLab Issue #6517 - TCMWindTool Fix; fixes #6517
Change-Id: I986c425ecc57ab919f2b43ec6b1c4438e789cd86

Former-commit-id: 427c442c31ba87f6c20bdfe17abedceb90fb2e7a
2015-02-25 13:51:44 -07:00
Greg Armendariz
6a5463ab87 Omaha #3299 - Updated deploy-install to find features
Change-Id: I107c16d832936d63af5dbc76b07166db119c95e2

Former-commit-id: a25d39959ccdc41ab99e0eaf4ad87559adfcb362
2015-02-25 09:51:49 -06:00
Dave Hladky
c7de9128a2 Omaha #3220 Verified config file is read when an update occurs.
Former-commit-id: 9ad78f067456eb04367a9d3aca58d9f5ee330c41
2015-02-24 16:20:56 -06:00
Steve Harris
6dc41740c8 Omaha #3220 - reverting #3841, #3873, and most of #3220
Revert "Omaha #3841 - Fixed saving problem for distance and time."
This reverts commit 15ae209055 [formerly d6737249fc9d3db54a143345053acdfe889686bf].
Revert "Omaha #3220 - Performance - Safe Seas, Snow, Fog."
This reverts commit 2bb8bc22a6 [formerly f8ee84a324b3653a75aa3c63a793eca412e1bd81].
Revert "Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers."
This reverts commit 9c57dab437 [formerly 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e].
Revert "Omaha #3841 - Corrected updateZones method."
This reverts commit 24322ed6ca [formerly 4d133cc367ab016b378ada534cff0fcda579e323].
Revert "Omaha #3220 - Moved refreshing of table in the UI thread."
This reverts commit d06882f4c9 [formerly 7454b39e71eeca348f4f167b8aa70d6ce5253004].
Revert "Omaha #3873 - Fixed assigning timeObs for maritime record."
This reverts commit 090bc93302 [formerly ccdf4928b9527e85684fb0d4eaa67435f8da5559].
Revert "Omaha #3841 - Updated the dialogs for adding and editing a new zone/station."
This reverts commit 8763f67abf [formerly 5a7e13b6a6db5ca766da3ad957c12077470359e7].
Revert "Omaha #3220 - Corrected area configuration managers for Fog, SAFESEAS and SNOW monitors."
This reverts commit 9c369a9c5c [formerly 5fb653e5c7f7ffff1daf53487147597a569d7d11].


Former-commit-id: fa81485722db0bcc734095c0639f0ac8875117b5
2015-02-24 15:39:04 -06:00
Fay.Liang
61d335650b Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 0580ad455973b3a176208203a140474df0040155
2015-02-24 15:36:40 -05:00
Fay.Liang
ff74566cda Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: c1bcd2a0db42c30d447a54ed185fc33d875628b3
2015-02-24 14:58:28 -05:00
Fay.Liang
94a7507b9b Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: d6d761a5170a91dbd6fed78af582bfc2a8f662a3
2015-02-24 14:56:50 -05:00
David Gillingham
34ea2453b8 Issue #4127: Add ClusterTask-backed write lock to ActiveTable.
Change-Id: I54309f369e7ef872fd102a764641569d95c62799

Former-commit-id: c564462d34bae64c3339339254d5cb6caba70fda
2015-02-24 12:39:03 -06:00
Ron Anderson
e19901c6e1 Issue #4099 Fix ETNs for products that span year-end.
(cherry picked from commit c7a8c9b049ae8d73ffb61765f31374e01d1d2a33)


Former-commit-id: 7ca4dd9ba059035e366807d4928768121fdd0712
2015-02-24 12:09:29 -06:00
Darrel Kingfield
00880112ba VLab Issue #6585 - MRMS Menu Activation for 14.4.1; fixes #6585
Former-commit-id: f43b83069eaf12e4190f1827eeed8d954239b164
2015-02-24 10:14:35 -06:00
David Friedman
cc2c3da325 ASM #14990 - Add pqact patterns for earthquake and tsunami products
Change-Id: Ied72bd5896a9e1939f4ddd9d68cb362067406d65

Former-commit-id: 899c6472abfdcfa27018d20cc204735dea4d2f43
2015-02-24 15:33:48 +00:00
David Lovely
d6f74b3e28 Omaha #4164 Fixed AlertViz communications issue and log file directories.
Change-Id: I8bd038487d9d2bda371915b3eb5680118429f389

Former-commit-id: 7e61e1d6b80ba69bcbed3e8bc51d56d2811d6369
2015-02-24 08:24:33 -06:00
Ana Rivera
861a749706 VLab Issue #6432 - EKDMOS: add entries for CONUS and AK in gribModels_NCEP-7.xml; fixes #6432
Change-Id: I3596da11343b453b2c9f48d4a3e271f19228197a

Former-commit-id: 9242a49a1a688379c625ee93af21e98a007470b0
2015-02-23 21:21:25 +00:00
Ana Rivera
13929d018d Merge "VLab Issue #6554 Removed dependency on org.apache.commons.logging; fixes #6554" into field_14.4.1
Former-commit-id: 628dedd3b89dfc591fa21677b308d866fb62e593
2015-02-23 20:56:31 +00:00
Ana Rivera
ccc338d7da VLab Issue #6566 - HTI: Update six scripts and one image; fixes #6566
Change-Id: I49052579740e22c54c0307d3787d9656bdf30bb5

Former-commit-id: 2f9dd9b8422b899146f73da0a3d922b32b021152
2015-02-23 17:28:29 +00:00
Ana Rivera
0e90c25595 VLab Issue #6432 - EKDMOS: update grib.xml; rename GribModel:7:14:114; fixes #6432
Change-Id: Ie2041a6e46cf421fc5ecafce49836007847855ac

Former-commit-id: a5fc4d46bff38ecab9c9019c5184fae99a6ecc90
2015-02-23 15:56:58 +00:00
Ana Rivera
3d882eed46 Merge branch master_14.3.2 'OB_14.3.2-15m' into tcv_14.3.2
Change-Id: I798ce412136ee0f30123835338920a4607909e1d

Former-commit-id: 70ac082595e5c9719807136ed2f2bebf61510016
2015-02-23 15:15:18 +00:00