Shawn.Hooper
8ffe88d856
ASM #224 - WarnGen: OB13.5.2 Template Errors
...
Change-Id: I99339c0ea3d0110ca855dd3db82b41b28a32dd6d
Former-commit-id: 79db962a88
[formerly c6fffaf265dc184b7692a43bb461572f54b8190a]
Former-commit-id: 09204a381c
2014-04-25 10:19:48 -04:00
Zhidong.Hao
f16936223a
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
...
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303
Former-commit-id: 0177756f97
[formerly 4e7edc8ebbd79c16d6eb725c8d11d05f20424ed4]
Former-commit-id: e1d5aa284d
2014-04-22 14:31:14 -04:00
Brian.Dyke
3b90abdf7a
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 9943a331c3
[formerly d07d06f5e4b3c1dbf7d165ad97b9b114a4819011]
Former-commit-id: 880329e4ae
2014-04-18 07:53:10 -04:00
Nate Jensen
54951100af
Issue #3018 addressing code review comments
...
Former-commit-id: 8ba6b2722d
[formerly 85d9dd0158ab873e1e9b76805853c712bb0c7c2c]
Former-commit-id: e327f5e0bf
2014-04-17 09:28:47 -05:00
Ron Anderson
85a1f55ea0
Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
...
Former-commit-id: 1ba72371be
[formerly 6813b32786289503950322c02e32803299566c5d]
Former-commit-id: f9a393172f
2014-04-16 18:02:11 -05:00
Nate Jensen
781ec3ecd6
Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
...
Former-commit-id: c362af04f3
[formerly 7384a2d32ef554362a0693038e9b60a589afb86a]
Former-commit-id: a085b71c81
2014-04-16 17:25:09 -05:00
Nate Jensen
a5edace073
Issue #3039 fix ifpImage class cast exception
...
Former-commit-id: 31fb61e824
[formerly a2fd849c603aebacce09662557bf1f008d379982]
Former-commit-id: 2b6db445c0
2014-04-16 16:17:05 -05:00
Nate Jensen
9ebedf0b98
Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
...
Former-commit-id: e0ae9e5f8f
[formerly 8e8bc62e063da4a8a864496ac6dbd73e798e45ed]
Former-commit-id: d121f07e76
2014-04-16 08:41:54 -05:00
Ron Anderson
2a68e875a5
Issue #3016 Fix ColormappedImage and ColorMapper.
...
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: 9f085a0856
[formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]
Former-commit-id: 6e0147169f
2014-04-15 17:22:12 -05:00
Ben Steffensmeier
49ca556b33
Issue #3017 Update SatSpatialFactory to have more specific methods.
...
Former-commit-id: 6ea38cfbb2
[formerly 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc]
Former-commit-id: ecbe6fd2d7
2014-04-15 13:29:05 -05:00
Steve Harris
9132d9004e
Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
...
Former-commit-id: 5bf5bdb6b0
[formerly f4c8ce899d312b389aff32d052564559e79904be]
Former-commit-id: eb2f2865fe
2014-04-15 09:39:33 -05:00
Benjamin Phillippe
490413551b
Issue #3011 Fixed replication slowdown
...
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 62062bf288
[formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]
Former-commit-id: 3db751fc5b
2014-04-15 09:15:12 -05:00
brian.dyke
5fc07cafc8
Merge branch 'master_14.2.1' into asm_14.2.1
...
Former-commit-id: a6708cc174
[formerly 14cd23697c705352544609e7ba7a3afdf5d778b1]
Former-commit-id: fb1c399d4d
2014-04-14 15:29:23 -04:00
Zhidong.Hao
f5877f5fb0
ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
...
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1
Former-commit-id: 9c18f60924
[formerly 015d4307168ca7fbc70bf0ae0e2e9abd24463d90]
Former-commit-id: 0b499061da
2014-04-11 15:51:12 -04:00
Zhidong.Hao
48ee7712c7
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
...
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c
Former-commit-id: 1a91b820d9
[formerly 30eba1a2397c41fed1b564af4c31791040b14eac]
Former-commit-id: 009c6e067a
2014-04-11 15:34:06 -04:00
Brian.Dyke
73be1016c0
Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 9cce8eb0d1
[formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]
Former-commit-id: 8c2f601b59
2014-04-10 13:26:42 -04:00
Richard Peter
5676090443
Merge branch 'master_14.1.2' into master_14.2.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: b15d288530
[formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]
Former-commit-id: 95eba8dcf6
2014-04-09 16:00:54 -05:00
Brian.Dyke
e4136f79dd
Merged 1354 -7 and -8 into 1412
...
Former-commit-id: 929b736038
[formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]
Former-commit-id: 947194c998
2014-04-09 11:39:07 -04:00
Ben Steffensmeier
5b3a8dccbf
Issue #2973 Use correct area for expanding subgrid requests.
...
Former-commit-id: 000f259cf4
[formerly 3cc81be3ed534aed54bf80b0654f28f7fd86cc8b]
Former-commit-id: 90f1750691
2014-04-04 13:17:36 -05:00
Brian.Dyke
17477e7db1
Merged 1354 -5 and -6 into 1412 based on 1411-25
...
Former-commit-id: dd98c213c7
[formerly 407b42b0eff676a95483e219d6be899e45effd6c]
Former-commit-id: 6a28fcb156
2014-04-04 12:57:32 -04:00
Steve Harris
4b96900460
Merge branch 'master_14.2.1' (14.2.1-16) into omaha_14.2.1
...
Former-commit-id: cb2d69e338
[formerly ce1a2d441c1c882209f56fcb82f79edad51ff114]
Former-commit-id: acd5392e9a
2014-04-03 13:00:11 -05:00
Ron Anderson
346984b8ab
Issue #2969 Fixed error when Topo parm is unloaded.
...
Fixed check state of Topography menu item.
Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b
Former-commit-id: d556055299
[formerly 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5]
Former-commit-id: 11fbd86558
2014-04-02 09:07:22 -05:00
Greg Armendariz
50fb1ec68a
Merge "Issue #2949 Updated scripts Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80" into omaha_14.2.1
...
Former-commit-id: 0d0d7bd513
[formerly 8d8277705568c04ac37bbe8f09bf7f38f2f0521f]
Former-commit-id: 6b339bcb86
2014-04-01 19:33:30 -05:00
Richard Peter
bfba75f73f
Issue #2509 : Fix stitched grid notifications
...
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4
Former-commit-id: f99875040c
[formerly 861f0c09baa01e191b430bce6699c0f1c95a52d2]
Former-commit-id: 53d5000261
2014-04-01 14:44:05 -05:00
Dave Hladky
41e43a169b
Issue #2949 Updated scripts
...
Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80
Former-commit-id: ede510dd91
[formerly afcfc72329522c2d731a4afe9353632effb9cb23]
Former-commit-id: 3d6ebf498e
2014-04-01 12:33:48 -05:00
David Gillingham
402adfeddb
Issue #2418 : Re-implement GFE support for pSurge 2.0 data to match A1.
...
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9
Former-commit-id: 70b28b4e1e
[formerly e820f7ea4046e42ae1112fe8b1a0f8455dbc997d]
Former-commit-id: a529bc8cad
2014-03-31 15:49:33 -05:00
Brian.Dyke
a1b980a15d
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: 3b639347f8
[formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]
Former-commit-id: 6346c9776b
2014-03-27 10:22:26 -04:00
Steve Harris
9cf3600ff6
Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
...
Former-commit-id: a7efde7cf4
[formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]
Former-commit-id: 4879520391
2014-03-26 15:51:32 -05:00
Brian.Dyke
027cca8673
Fixed comment merge conflicts added .gitignore
...
Former-commit-id: a0e7cb624a
[formerly 6093428342170b9fd8deb741a5721375e80bc955]
Former-commit-id: 7cc471a9c9
2014-03-25 15:41:58 -04:00
Brian.Dyke
c085bc6879
OB_14.1.1-25 baseline
...
Former-commit-id: 074abeb0fa
[formerly dd2417b58b33005985f80cc83b45134132b3e5a1]
Former-commit-id: c67833407c
2014-03-25 13:55:54 -04:00
Richard Peter
6236137635
Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1
...
Former-commit-id: 897980da08
[formerly 5fee1c62ae87e59007b57ba74268b5f272648127]
Former-commit-id: 390e73af44
2014-03-24 09:53:13 -05:00
Dave Hladky
39343e1801
Issue #2939 Madis data mismatches
...
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 9f3c5dcc42
[formerly 4105db3604440c6c01b99a11fdc0573e6934376c]
Former-commit-id: 3ac04dd071
2014-03-24 08:27:12 -05:00
Mike Duff
ff07b90659
Issue #2941 - Sort data before returning
...
Former-commit-id: 4db73e42a5
[formerly 6c9ebb120761257af5e8d6ec08fa9634e5e55185]
Former-commit-id: 73a011b940
2014-03-24 08:19:21 -05:00
Brian.Dyke
50e5f4f78d
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 07b2e04d7a
[formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]
Former-commit-id: 06ee9a6384
2014-03-24 07:01:29 -04:00
Brian.Dyke
37e9d48d45
OB_14.1.1-24 baseline
...
Former-commit-id: face1ebeeb
[formerly 8b1e7457fc58021208e4233502f118cf34df7534]
Former-commit-id: 37b6368268
2014-03-21 12:43:50 -04:00
Ben Steffensmeier
14907292da
Issue #2932 improve compatibility of pop skewT and blended resources.
...
Former-commit-id: effb0bfcd8
[formerly 49ffd67e77fef3c76f712cdf0eaa9b5e8ecff737]
Former-commit-id: 933b172ca0
2014-03-20 13:18:40 -05:00
Nate Jensen
6edec10edc
Issue #2919 fix windows error due to gempak library missing
...
Former-commit-id: 82ee3e7104
[formerly 5a2ba132d9e32ce8a018f35ba2524881e5276120]
Former-commit-id: 747ac58166
2014-03-20 09:38:07 -05:00
Brian.Dyke
9f332e938c
Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 9c412e444e
[formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]
Former-commit-id: d23acbdd48
2014-03-14 11:13:30 -04:00
Brian.Dyke
24a63fb05a
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 30084d7f84
[formerly 39f4506422c590b7520957923a5b00fd16aa19d0]
Former-commit-id: 030a18f804
2014-03-14 10:15:53 -04:00
Brian.Dyke
4e3096631d
Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: f999e48df0
[formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]
Former-commit-id: d4b6d22ae2
2014-03-14 08:44:39 -04:00
Brian.Dyke
55918ee421
OB_14.1.1-23 baseline
...
Former-commit-id: bc6a7bf946
[formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]
Former-commit-id: dcc2e4fd61
2014-03-14 08:18:16 -04:00
Kevin P. Johnson
e3a951da78
ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call
...
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67
Former-commit-id: 4c833d3389
[formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]
Former-commit-id: b2797a0788
2014-03-13 20:42:12 +00:00
Ben Steffensmeier
e6cd8b3167
Issue #2528 Fix satellite units/style.
...
Former-commit-id: 75120a09cd
[formerly 7e38454a31aa55c606c155a108253c0433ecb517]
Former-commit-id: 77041e5b17
2014-03-12 14:19:49 -05:00
Richard Peter
e981ce3e36
Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
...
Former-commit-id: f59d1433db
[formerly 555358125bfb925a2c8ed0d393911b4d045d18b1]
Former-commit-id: 18234c5d73
2014-03-11 16:43:37 -05:00
Dave Hladky
7cd4304140
Issue #2678 end retrieval double clutching
...
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc
Former-commit-id: 76e216d319
[formerly 31a35e35b75bc9e6efc43af1da0b184c1828ff45]
Former-commit-id: 3500ad262a
2014-03-11 15:53:59 -05:00
Nate Jensen
cef0438c35
Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1
...
Former-commit-id: afbdf6962c
[formerly d463531d4cf3bce8862ce1c29b12e9a594d8c63b]
Former-commit-id: 85f5821a6f
2014-03-11 12:35:44 -05:00
David Gillingham
e3a3cf7bad
Issue #2509 : Fix static topo generation break caused by baseline merge.
...
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68
Former-commit-id: 187196b519
[formerly 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7]
Former-commit-id: b0783b64ce
2014-03-11 11:54:25 -05:00
Ben Steffensmeier
c7fa392f3f
Issue #2896 Fix sat best res on weird projections
...
Former-commit-id: 560fc688bc
[formerly 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb]
Former-commit-id: 8bb517836a
2014-03-11 11:07:43 -05:00
Nate Jensen
17aa39ce0a
Issue #2779 update memory settings for renamed NC perspective
...
Former-commit-id: 5eb892f4cf
[formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]
Former-commit-id: ccb06db199
2014-03-11 10:28:01 -05:00
Brian.Dyke
fa16721854
Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: fcc9115b0d
[formerly eaa41b4f2dd9fce2d957a2311ee3f4f04f220365]
Former-commit-id: 552490206f
2014-03-11 10:44:03 -04:00