Ron Anderson
|
d2b4d70702
|
Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: 9f085a0856 [formerly 6e0147169f [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]
Former-commit-id: 6e0147169f
Former-commit-id: 2a68e875a5
|
2014-04-15 17:22:12 -05:00 |
|
Ben Steffensmeier
|
2c5ef01980
|
Issue #3017 Update SatSpatialFactory to have more specific methods.
Former-commit-id: 6ea38cfbb2 [formerly ecbe6fd2d7 [formerly 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc]]
Former-commit-id: ecbe6fd2d7
Former-commit-id: 49ca556b33
|
2014-04-15 13:29:05 -05:00 |
|
Steve Harris
|
9ff3077435
|
Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
Former-commit-id: 5bf5bdb6b0 [formerly eb2f2865fe [formerly f4c8ce899d312b389aff32d052564559e79904be]]
Former-commit-id: eb2f2865fe
Former-commit-id: 9132d9004e
|
2014-04-15 09:39:33 -05:00 |
|
Benjamin Phillippe
|
575caa6238
|
Issue #3011 Fixed replication slowdown
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 62062bf288 [formerly 3db751fc5b [formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]]
Former-commit-id: 3db751fc5b
Former-commit-id: 490413551b
|
2014-04-15 09:15:12 -05:00 |
|
brian.dyke
|
33274850e3
|
Merge branch 'master_14.2.1' into asm_14.2.1
Former-commit-id: a6708cc174 [formerly fb1c399d4d [formerly 14cd23697c705352544609e7ba7a3afdf5d778b1]]
Former-commit-id: fb1c399d4d
Former-commit-id: 5fc07cafc8
|
2014-04-14 15:29:23 -04:00 |
|
Zhidong.Hao
|
a153f7218e
|
ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1
Former-commit-id: 9c18f60924 [formerly 0b499061da [formerly 015d4307168ca7fbc70bf0ae0e2e9abd24463d90]]
Former-commit-id: 0b499061da
Former-commit-id: f5877f5fb0
|
2014-04-11 15:51:12 -04:00 |
|
Zhidong.Hao
|
8e54cb2958
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c
Former-commit-id: 1a91b820d9 [formerly 009c6e067a [formerly 30eba1a2397c41fed1b564af4c31791040b14eac]]
Former-commit-id: 009c6e067a
Former-commit-id: 48ee7712c7
|
2014-04-11 15:34:06 -04:00 |
|
Brian.Dyke
|
2cb1541fe9
|
ASM #465 - Update capture script to prevent hanging when running psql
Change-Id: I74c9fe349509850522a8bee37f34664559435d3c
Former-commit-id: deff8ed340 [formerly 192a5513df [formerly 17ab69323dd1b420662db25e09b05e3408d3f2ab]]
Former-commit-id: 192a5513df
Former-commit-id: af5cbe3321
|
2014-04-11 11:18:06 -04:00 |
|
brian.dyke
|
c75dba32e9
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: a8d6d58f31 [formerly 6575f77fe3 [formerly 274338d3dfb6a839a59da8740ed968d8f0779d7d]]
Former-commit-id: 6575f77fe3
Former-commit-id: 6a9ccba393
|
2014-04-11 10:58:48 -04:00 |
|
Brian.Dyke
|
b6e4e23394
|
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 8c2f601b59 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]
Former-commit-id: 8c2f601b59
Former-commit-id: 73be1016c0
|
2014-04-10 13:26:42 -04:00 |
|
Richard Peter
|
efd1003a50
|
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 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: 95eba8dcf6
Former-commit-id: 5676090443
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
7de936dfba
|
Merged 1354 -7 and -8 into 1412
Former-commit-id: 929b736038 [formerly 947194c998 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]
Former-commit-id: 947194c998
Former-commit-id: e4136f79dd
|
2014-04-09 11:39:07 -04:00 |
|
Brian.Dyke
|
518167e0bb
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 79c7ec7ae9 [formerly 20fef0f15b [formerly 92976dff4bbc7ed3c73600f061b5d8ba58dbeb35]]
Former-commit-id: 20fef0f15b
Former-commit-id: 529059851a
|
2014-04-08 13:05:12 -04:00 |
|
Ben Steffensmeier
|
4e60abfd33
|
Issue #2973 Use correct area for expanding subgrid requests.
Former-commit-id: 000f259cf4 [formerly 90f1750691 [formerly 3cc81be3ed534aed54bf80b0654f28f7fd86cc8b]]
Former-commit-id: 90f1750691
Former-commit-id: 5b3a8dccbf
|
2014-04-04 13:17:36 -05:00 |
|
Brian.Dyke
|
2eec862ebb
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]
Former-commit-id: 6a28fcb156
Former-commit-id: 17477e7db1
|
2014-04-04 12:57:32 -04:00 |
|
steve.naples
|
5d7cf6c098
|
ASM #471 Updated Radar Bias Table Dialog to pass other office id and bias properly.
Change-Id: I3566b9e6bb5f29000beded0b6912b6771ebc85f5
Former-commit-id: 7624f7ab75 [formerly f6636a3dd7 [formerly 1c71a34944c7d823742b98dc65e19fe1f478eef0]]
Former-commit-id: f6636a3dd7
Former-commit-id: 75be620d0d
|
2014-04-04 15:30:18 +00:00 |
|
Steve Harris
|
8715e0edc8
|
Merge branch 'master_14.2.1' (14.2.1-16) into omaha_14.2.1
Former-commit-id: cb2d69e338 [formerly acd5392e9a [formerly ce1a2d441c1c882209f56fcb82f79edad51ff114]]
Former-commit-id: acd5392e9a
Former-commit-id: 4b96900460
|
2014-04-03 13:00:11 -05:00 |
|
Ron Anderson
|
4bb7f13198
|
Issue #2969 Fixed error when Topo parm is unloaded.
Fixed check state of Topography menu item.
Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b
Former-commit-id: d556055299 [formerly 11fbd86558 [formerly 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5]]
Former-commit-id: 11fbd86558
Former-commit-id: 346984b8ab
|
2014-04-02 09:07:22 -05:00 |
|
Greg Armendariz
|
7f46616b73
|
Merge "Issue #2949 Updated scripts Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80" into omaha_14.2.1
Former-commit-id: 0d0d7bd513 [formerly 6b339bcb86 [formerly 8d8277705568c04ac37bbe8f09bf7f38f2f0521f]]
Former-commit-id: 6b339bcb86
Former-commit-id: 50fb1ec68a
|
2014-04-01 19:33:30 -05:00 |
|
Richard Peter
|
9536a08425
|
Issue #2509: Fix stitched grid notifications
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4
Former-commit-id: f99875040c [formerly 53d5000261 [formerly 861f0c09baa01e191b430bce6699c0f1c95a52d2]]
Former-commit-id: 53d5000261
Former-commit-id: bfba75f73f
|
2014-04-01 14:44:05 -05:00 |
|
Brian.Dyke
|
411457248b
|
Merge branch 'omaha_14.2.2' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.2 into master_14.2.2
Former-commit-id: 1f5c6139e3 [formerly 6e515eb334 [formerly 5dbe50379db1558323dff2ffdc541cd81adfea4b]]
Former-commit-id: 6e515eb334
Former-commit-id: 3186434368
|
2014-04-01 14:29:33 -04:00 |
|
Dave Hladky
|
daa2f2ba43
|
Issue #2949 Updated scripts
Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80
Former-commit-id: ede510dd91 [formerly 3d6ebf498e [formerly afcfc72329522c2d731a4afe9353632effb9cb23]]
Former-commit-id: 3d6ebf498e
Former-commit-id: 41e43a169b
|
2014-04-01 12:33:48 -05:00 |
|
David Gillingham
|
d14aee89aa
|
Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1.
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9
Former-commit-id: 70b28b4e1e [formerly a529bc8cad [formerly e820f7ea4046e42ae1112fe8b1a0f8455dbc997d]]
Former-commit-id: a529bc8cad
Former-commit-id: 402adfeddb
|
2014-03-31 15:49:33 -05:00 |
|
David Friedman
|
ee37afaf7b
|
Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]
Former-commit-id: fd900e38c2
Former-commit-id: 32a7adbe4b
|
2014-03-27 19:17:03 +00:00 |
|
Brian.Dyke
|
7ca114f7f1
|
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 6346c9776b [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]
Former-commit-id: 6346c9776b
Former-commit-id: a1b980a15d
|
2014-03-27 10:22:26 -04:00 |
|
Steve Harris
|
e621e81f20
|
Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
Former-commit-id: a7efde7cf4 [formerly 4879520391 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]]
Former-commit-id: 4879520391
Former-commit-id: 9cf3600ff6
|
2014-03-26 15:51:32 -05:00 |
|
Brian.Dyke
|
642cdfe2e6
|
Fixed comment merge conflicts added .gitignore
Former-commit-id: a0e7cb624a [formerly 7cc471a9c9 [formerly 6093428342170b9fd8deb741a5721375e80bc955]]
Former-commit-id: 7cc471a9c9
Former-commit-id: 027cca8673
|
2014-03-25 15:41:58 -04:00 |
|
Brian.Dyke
|
c66bac30c7
|
OB_14.1.1-25 baseline
Former-commit-id: 074abeb0fa [formerly c67833407c [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]
Former-commit-id: c67833407c
Former-commit-id: c085bc6879
|
2014-03-25 13:55:54 -04:00 |
|
Richard Peter
|
d4c67a0f8c
|
Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1
Former-commit-id: 897980da08 [formerly 390e73af44 [formerly 5fee1c62ae87e59007b57ba74268b5f272648127]]
Former-commit-id: 390e73af44
Former-commit-id: 6236137635
|
2014-03-24 09:53:13 -05:00 |
|
Dave Hladky
|
912c7e2d12
|
Issue #2939 Madis data mismatches
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 9f3c5dcc42 [formerly 3ac04dd071 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]
Former-commit-id: 3ac04dd071
Former-commit-id: 39343e1801
|
2014-03-24 08:27:12 -05:00 |
|
Mike Duff
|
d7d06e18fd
|
Issue #2941 - Sort data before returning
Former-commit-id: 4db73e42a5 [formerly 73a011b940 [formerly 6c9ebb120761257af5e8d6ec08fa9634e5e55185]]
Former-commit-id: 73a011b940
Former-commit-id: ff07b90659
|
2014-03-24 08:19:21 -05:00 |
|
Brian.Dyke
|
674036b172
|
Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 07b2e04d7a [formerly 06ee9a6384 [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]
Former-commit-id: 06ee9a6384
Former-commit-id: 50e5f4f78d
|
2014-03-24 07:01:29 -04:00 |
|
Brian.Dyke
|
8366e88db1
|
OB_14.1.1-24 baseline
Former-commit-id: face1ebeeb [formerly 37b6368268 [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]
Former-commit-id: 37b6368268
Former-commit-id: 37e9d48d45
|
2014-03-21 12:43:50 -04:00 |
|
Ben Steffensmeier
|
12d5339c48
|
Issue #2932 improve compatibility of pop skewT and blended resources.
Former-commit-id: effb0bfcd8 [formerly 933b172ca0 [formerly 49ffd67e77fef3c76f712cdf0eaa9b5e8ecff737]]
Former-commit-id: 933b172ca0
Former-commit-id: 14907292da
|
2014-03-20 13:18:40 -05:00 |
|
Nate Jensen
|
a3220cf170
|
Issue #2919 fix windows error due to gempak library missing
Former-commit-id: 82ee3e7104 [formerly 747ac58166 [formerly 5a2ba132d9e32ce8a018f35ba2524881e5276120]]
Former-commit-id: 747ac58166
Former-commit-id: 6edec10edc
|
2014-03-20 09:38:07 -05:00 |
|
steve.naples
|
20399400cb
|
ASM #428 Updated SATPRE file header to correct reftime.
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204
Former-commit-id: 1aa970164f [formerly d0f4df4ad9 [formerly e51a12ae977528eb85d2c59505ac5be92d945cfe]]
Former-commit-id: d0f4df4ad9
Former-commit-id: 64b19f2e41
|
2014-03-19 18:16:41 +00:00 |
|
Juliya Dynina
|
a7d0d73bfb
|
Merge "ASM #338 Updated HRAPCoordinates to not parse whitespace" into asm_14.2.2
Former-commit-id: 7a14dfb5a9 [formerly 9aa170ca5f [formerly 8f842b0defba552ebbbe980b42dfb7618a2a7ccd]]
Former-commit-id: 9aa170ca5f
Former-commit-id: 34b6972f79
|
2014-03-18 13:52:48 -05:00 |
|
steve.naples
|
e9e171be78
|
ASM #338 Updated HRAPCoordinates to not parse whitespace
Change-Id: I353e8a07927f3e36aa8905506f63b0e50f2179a6
Former-commit-id: 75e8a907fe [formerly 309ff4e7f7 [formerly 220ef7b1195366834c9f85b828862f128dd3fea1]]
Former-commit-id: 309ff4e7f7
Former-commit-id: 46675eec43
|
2014-03-18 15:40:13 +00:00 |
|
Juliya Dynina
|
83e355b778
|
Merge "ASM #330 - Fix reloading of TextDB static files" into asm_14.2.2
Former-commit-id: ef873880b6 [formerly 85fd3b3888 [formerly 0d338537015e8e8a98fa67bc658fa3a4ed0f15f0]]
Former-commit-id: 85fd3b3888
Former-commit-id: 30545f79c5
|
2014-03-18 08:47:22 -05:00 |
|
Juliya Dynina
|
0691c153f7
|
Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2
Former-commit-id: 867f00b438 [formerly c735051e00 [formerly 669d66d3b8279833df4a361c961c113e653a542d]]
Former-commit-id: c735051e00
Former-commit-id: d6e2b7f741
|
2014-03-18 08:13:51 -05:00 |
|
David Friedman
|
4492bf353d
|
ASM #330 - Fix reloading of TextDB static files
Change-Id: I23c6f2883c5ce645854283996fd391f805b2b4f5
Former-commit-id: decdadce01 [formerly 15ca9f4dcc [formerly 0a94094f0f140de68da634cbc6c79039507712ca]]
Former-commit-id: 15ca9f4dcc
Former-commit-id: fd203b5999
|
2014-03-18 13:12:40 +00:00 |
|
Qinglu.Lin
|
a62e75e8b5
|
ASM #335 - Watch wording not being inserted for SMW and SMW followup
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05
Former-commit-id: af82143e84 [formerly 4b3c821ce0 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]]
Former-commit-id: 4b3c821ce0
Former-commit-id: 09e90dfe43
|
2014-03-17 18:17:49 -04:00 |
|
Steve Harris
|
2db52dab8e
|
Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 24fe6a248f [formerly d087c8c31e [formerly 543090e28936ce680e21cda802cfac73ff31ca58]]
Former-commit-id: d087c8c31e
Former-commit-id: 951c9b0d31
|
2014-03-17 15:53:31 -05:00 |
|
Matthew Howard
|
b1bf3db462
|
Merge "ASM #84 - fix default time range for smart tools" into asm_14.2.2
Former-commit-id: 1d15cda9fd [formerly c1433db0fb [formerly 1b46d5c169709a9498a5eb9963286a6223089af4]]
Former-commit-id: c1433db0fb
Former-commit-id: 30e8d76f50
|
2014-03-14 19:47:32 -05:00 |
|
Rici.Yu
|
777bd46d68
|
ASM #84 - fix default time range for smart tools
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99
Former-commit-id: 58f9857344 [formerly 74b1c827ee [formerly cfb3459d6314afa396c89b90bf42ab539fd15d8c]]
Former-commit-id: 74b1c827ee
Former-commit-id: c559ade333
|
2014-03-14 14:39:56 -04:00 |
|
Brian.Dyke
|
e85e3c2e70
|
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 d23acbdd48 [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]
Former-commit-id: d23acbdd48
Former-commit-id: 9f332e938c
|
2014-03-14 11:13:30 -04:00 |
|
Brian.Dyke
|
670c673e8a
|
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 030a18f804 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]
Former-commit-id: 030a18f804
Former-commit-id: 24a63fb05a
|
2014-03-14 10:15:53 -04:00 |
|
Brian.Dyke
|
a68bda6858
|
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 d4b6d22ae2 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]
Former-commit-id: d4b6d22ae2
Former-commit-id: 4e3096631d
|
2014-03-14 08:44:39 -04:00 |
|
Brian.Dyke
|
b24e7a66d8
|
OB_14.1.1-23 baseline
Former-commit-id: bc6a7bf946 [formerly dcc2e4fd61 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]
Former-commit-id: dcc2e4fd61
Former-commit-id: 55918ee421
|
2014-03-14 08:18:16 -04:00 |
|
Kevin P. Johnson
|
c791f55d02
|
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 b2797a0788 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]
Former-commit-id: b2797a0788
Former-commit-id: e3a951da78
|
2014-03-13 20:42:12 +00:00 |
|