Ron Anderson
2a68e875a5
Issue #3016 Fix ColormappedImage and ColorMapper.
...
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: 9f085a08566e0147169f
2014-04-15 17:22:12 -05:00
Ben Steffensmeier
49ca556b33
Issue #3017 Update SatSpatialFactory to have more specific methods.
...
Former-commit-id: 6ea38cfbb2ecbe6fd2d7
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: 5bf5bdb6b0eb2f2865fe
2014-04-15 09:39:33 -05:00
Benjamin Phillippe
490413551b
Issue #3011 Fixed replication slowdown
...
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 62062bf2883db751fc5b
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: a6708cc174fb1c399d4d
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: 9c18f609240b499061da
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: 1a91b820d9009c6e067a
2014-04-11 15:34:06 -04:00
Brian.Dyke
af5cbe3321
ASM #465 - Update capture script to prevent hanging when running psql
...
Change-Id: I74c9fe349509850522a8bee37f34664559435d3c
Former-commit-id: deff8ed340192a5513df
2014-04-11 11:18:06 -04:00
brian.dyke
6a9ccba393
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: a8d6d58f316575f77fe3
2014-04-11 10:58:48 -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: 9cce8eb0d18c2f601b59
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: b15d28853095eba8dcf6
2014-04-09 16:00:54 -05:00
Steve Harris
842e355cc7
Merge branch 'master_14.2.2' (14.2.2-3) into omaha_14.2.2
...
Former-commit-id: 2ea3d45eccae196946b9
2014-04-09 13:24:52 -05:00
Brian.Dyke
e4136f79dd
Merged 1354 -7 and -8 into 1412
...
Former-commit-id: 929b736038947194c998
2014-04-09 11:39:07 -04:00
Brian.Dyke
529059851a
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 79c7ec7ae920fef0f15b
2014-04-08 13:05:12 -04:00
Ben Steffensmeier
5b3a8dccbf
Issue #2973 Use correct area for expanding subgrid requests.
...
Former-commit-id: 000f259cf490f1750691
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: dd98c213c76a28fcb156
2014-04-04 12:57:32 -04:00
steve.naples
75be620d0d
ASM #471 Updated Radar Bias Table Dialog to pass other office id and bias properly.
...
Change-Id: I3566b9e6bb5f29000beded0b6912b6771ebc85f5
Former-commit-id: 7624f7ab75f6636a3dd7
2014-04-04 15:30:18 +00:00
Steve Harris
4e65ecbf48
Merge branch 'master_14.2.2' (14.2.2-1,2) into omaha_14.2.2
...
Former-commit-id: 58b8f7275515bc450e94
2014-04-03 13:08:28 -05:00
Steve Harris
4b96900460
Merge branch 'master_14.2.1' (14.2.1-16) into omaha_14.2.1
...
Former-commit-id: cb2d69e338acd5392e9a
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: d55605529911fbd86558
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: 0d0d7bd5136b339bcb86
2014-04-01 19:33:30 -05:00
Richard Peter
bfba75f73f
Issue #2509 : Fix stitched grid notifications
...
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4
Former-commit-id: f99875040c53d5000261
2014-04-01 14:44:05 -05:00
Brian.Dyke
3186434368
Merge branch 'omaha_14.2.2' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.2 into master_14.2.2
...
Former-commit-id: 1f5c6139e36e515eb334
2014-04-01 14:29:33 -04:00
Dave Hladky
41e43a169b
Issue #2949 Updated scripts
...
Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80
Former-commit-id: ede510dd913d6ebf498e
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: 70b28b4e1ea529bc8cad
2014-03-31 15:49:33 -05:00
David Friedman
32a7adbe4b
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: f146c7bcd0fd900e38c2
2014-03-27 19:17:03 +00: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: 3b639347f86346c9776b
2014-03-27 10:22:26 -04:00
Steve Harris
d940427408
Merge branch 'master_14.2.2' into omaha_14.2.2
...
Former-commit-id: e5910b6c6053f91fdeea
2014-03-26 16:13:59 -05:00
Steve Harris
9cf3600ff6
Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
...
Former-commit-id: a7efde7cf44879520391
2014-03-26 15:51:32 -05:00
Brian.Dyke
027cca8673
Fixed comment merge conflicts added .gitignore
...
Former-commit-id: a0e7cb624a7cc471a9c9
2014-03-25 15:41:58 -04:00
Brian.Dyke
c085bc6879
OB_14.1.1-25 baseline
...
Former-commit-id: 074abeb0fac67833407c
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: 897980da08390e73af44
2014-03-24 09:53:13 -05:00
Dave Hladky
39343e1801
Issue #2939 Madis data mismatches
...
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 9f3c5dcc423ac04dd071
2014-03-24 08:27:12 -05:00
Mike Duff
ff07b90659
Issue #2941 - Sort data before returning
...
Former-commit-id: 4db73e42a573a011b940
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: 07b2e04d7a06ee9a6384
2014-03-24 07:01:29 -04:00
Brian.Dyke
37e9d48d45
OB_14.1.1-24 baseline
...
Former-commit-id: face1ebeeb37b6368268
2014-03-21 12:43:50 -04:00
Ben Steffensmeier
14907292da
Issue #2932 improve compatibility of pop skewT and blended resources.
...
Former-commit-id: effb0bfcd8933b172ca0
2014-03-20 13:18:40 -05:00
Nate Jensen
6edec10edc
Issue #2919 fix windows error due to gempak library missing
...
Former-commit-id: 82ee3e7104747ac58166
2014-03-20 09:38:07 -05:00
steve.naples
64b19f2e41
ASM #428 Updated SATPRE file header to correct reftime.
...
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204
Former-commit-id: 1aa970164fd0f4df4ad9
2014-03-19 18:16:41 +00:00
Juliya Dynina
34b6972f79
Merge "ASM #338 Updated HRAPCoordinates to not parse whitespace" into asm_14.2.2
...
Former-commit-id: 7a14dfb5a99aa170ca5f
2014-03-18 13:52:48 -05:00
steve.naples
46675eec43
ASM #338 Updated HRAPCoordinates to not parse whitespace
...
Change-Id: I353e8a07927f3e36aa8905506f63b0e50f2179a6
Former-commit-id: 75e8a907fe309ff4e7f7
2014-03-18 15:40:13 +00:00
Juliya Dynina
30545f79c5
Merge "ASM #330 - Fix reloading of TextDB static files" into asm_14.2.2
...
Former-commit-id: ef873880b685fd3b3888
2014-03-18 08:47:22 -05:00
Juliya Dynina
d6e2b7f741
Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2
...
Former-commit-id: 867f00b438c735051e00
2014-03-18 08:13:51 -05:00
David Friedman
fd203b5999
ASM #330 - Fix reloading of TextDB static files
...
Change-Id: I23c6f2883c5ce645854283996fd391f805b2b4f5
Former-commit-id: decdadce0115ca9f4dcc
2014-03-18 13:12:40 +00:00
Qinglu.Lin
09e90dfe43
ASM #335 - Watch wording not being inserted for SMW and SMW followup
...
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05
Former-commit-id: af82143e844b3c821ce0
2014-03-17 18:17:49 -04:00
Steve Harris
951c9b0d31
Merge branch 'master_14.2.2' into omaha_14.2.2
...
Former-commit-id: 24fe6a248fd087c8c31e
2014-03-17 15:53:31 -05:00
Matthew Howard
30e8d76f50
Merge "ASM #84 - fix default time range for smart tools" into asm_14.2.2
...
Former-commit-id: 1d15cda9fdc1433db0fb
2014-03-14 19:47:32 -05:00
Rici.Yu
c559ade333
ASM #84 - fix default time range for smart tools
...
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99
Former-commit-id: 58f985734474b1c827ee
2014-03-14 14:39:56 -04: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: 9c412e444ed23acbdd48
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: 30084d7f84030a18f804
2014-03-14 10:15:53 -04:00
