Shawn.Hooper
a3e52e8cea
ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml
...
Change-Id: I505a9cc943b7ab09b430ca826efa1ee81f08a930
Former-commit-id: 968a136e81b6247a03af9b78643c388d21a4218b
2014-04-25 10:40:43 -04:00
Nate Jensen
e327f5e0bf
Issue #3018 addressing code review comments
...
Former-commit-id: 85d9dd0158ab873e1e9b76805853c712bb0c7c2c
2014-04-17 09:28:47 -05:00
Ron Anderson
f9a393172f
Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
...
Former-commit-id: 6813b32786289503950322c02e32803299566c5d
2014-04-16 18:02:11 -05:00
Nate Jensen
a085b71c81
Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
...
Former-commit-id: 7384a2d32ef554362a0693038e9b60a589afb86a
2014-04-16 17:25:09 -05:00
Nate Jensen
2b6db445c0
Issue #3039 fix ifpImage class cast exception
...
Former-commit-id: a2fd849c603aebacce09662557bf1f008d379982
2014-04-16 16:17:05 -05:00
Ron Anderson
6e0147169f
Issue #3016 Fix ColormappedImage and ColorMapper.
...
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: f7d07544e07552c7fccf744c269ee4aa54dc745c
2014-04-15 17:22:12 -05:00
Brian.Dyke
8c2f601b59
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: 4e5541582b38abcd744cf25549d007c9e8f1a104
2014-04-10 13:26:42 -04:00
Richard Peter
95eba8dcf6
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: 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2
2014-04-09 16:00:54 -05:00
Brian.Dyke
947194c998
Merged 1354 -7 and -8 into 1412
...
Former-commit-id: 082b54dc10676b7090f8a1c9a01929a6d7da2667
2014-04-09 11:39:07 -04:00
Ben Steffensmeier
90f1750691
Issue #2973 Use correct area for expanding subgrid requests.
...
Former-commit-id: 3cc81be3ed534aed54bf80b0654f28f7fd86cc8b
2014-04-04 13:17:36 -05:00
Brian.Dyke
6a28fcb156
Merged 1354 -5 and -6 into 1412 based on 1411-25
...
Former-commit-id: 407b42b0eff676a95483e219d6be899e45effd6c
2014-04-04 12:57:32 -04:00
Ron Anderson
11fbd86558
Issue #2969 Fixed error when Topo parm is unloaded.
...
Fixed check state of Topography menu item.
Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b
Former-commit-id: 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5
2014-04-02 09:07:22 -05:00
Brian.Dyke
6346c9776b
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: 3b24535fec4e47c1eb0bb845f77dd2f407ecf412
2014-03-27 10:22:26 -04:00
Steve Harris
4879520391
Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
...
Former-commit-id: 42a1ec47aa72a882d0f53f94eba3284dccd89b21
2014-03-26 15:51:32 -05:00
Brian.Dyke
7cc471a9c9
Fixed comment merge conflicts added .gitignore
...
Former-commit-id: 6093428342170b9fd8deb741a5721375e80bc955
2014-03-25 15:41:58 -04:00
Brian.Dyke
c67833407c
OB_14.1.1-25 baseline
...
Former-commit-id: dd2417b58b33005985f80cc83b45134132b3e5a1
2014-03-25 13:55:54 -04:00
Brian.Dyke
06ee9a6384
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 34f830b4933bd6c7149757ce34136c7a18d030bf
2014-03-24 07:01:29 -04:00
Brian.Dyke
37b6368268
OB_14.1.1-24 baseline
...
Former-commit-id: 8b1e7457fc58021208e4233502f118cf34df7534
2014-03-21 12:43:50 -04:00
Ben Steffensmeier
933b172ca0
Issue #2932 improve compatibility of pop skewT and blended resources.
...
Former-commit-id: 49ffd67e77fef3c76f712cdf0eaa9b5e8ecff737
2014-03-20 13:18:40 -05:00
Nate Jensen
747ac58166
Issue #2919 fix windows error due to gempak library missing
...
Former-commit-id: 5a2ba132d9e32ce8a018f35ba2524881e5276120
2014-03-20 09:38:07 -05:00
Brian.Dyke
030a18f804
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 39f4506422c590b7520957923a5b00fd16aa19d0
2014-03-14 10:15:53 -04:00
Brian.Dyke
d4b6d22ae2
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: 3605f0373a6ce7b417d942991e50029c2d0c964b
2014-03-14 08:44:39 -04:00
Kevin P. Johnson
b2797a0788
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: fad7cf2e6661aa0bcc9c37499e0560b708f192f0
2014-03-13 20:42:12 +00:00
Nate Jensen
85f5821a6f
Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1
...
Former-commit-id: d463531d4cf3bce8862ce1c29b12e9a594d8c63b
2014-03-11 12:35:44 -05:00
Ben Steffensmeier
8bb517836a
Issue #2896 Fix sat best res on weird projections
...
Former-commit-id: 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb
2014-03-11 11:07:43 -05:00
Nate Jensen
ccb06db199
Issue #2779 update memory settings for renamed NC perspective
...
Former-commit-id: bc1c10ee0039906ec0b48e834e533332611ac0d3
2014-03-11 10:28:01 -05:00
brian.dyke
654778bb0d
Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
...
Former-commit-id: 9dba33a7122e20c0502b2bf8036ec875e957798b
2014-03-10 15:36:56 -04:00
Nate Jensen
6a75fe686a
Issue #2779 add .ini generation of memory settings for other components
...
Former-commit-id: 71a7f485c5a32caeabc98f23164c9fc87cfa1787
2014-03-10 10:03:02 -05:00
Steve Harris
92232fa063
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 81f446dbc2ae8f8c54cba5b29ed57f113d318160
2014-03-07 15:16:18 -06:00
Shawn.Hooper
8c9f9b3ae0
ASM #378 - MPE gages are not listed/available in gage table
...
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a
Former-commit-id: 55b1066b8674a044602297e64cb557ced5faf92a
2014-03-07 12:57:36 -05:00
Brian.Dyke
394076196b
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7
2014-03-07 09:01:09 -05:00
Brian.Dyke
312cd8a3e8
Merge branch 'fun_merge' into master_14.2.1
...
Former-commit-id: bb169bc0992f28fe1527cb0106771c35415cea24
2014-03-07 08:57:07 -05:00
Brian.Dyke
21f17d4f9b
14.1.1-22 baseline
...
Former-commit-id: ae37ad5bac445251d1456f37588819fccfede061
2014-03-07 08:49:00 -05:00
Steve Harris
7f1ad89df9
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 22538918b8a7175bbb517cbf65ec3738e65a6eb2
2014-03-06 18:19:55 -06:00
Brian.Dyke
db274c890f
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: 1edba9216beac913f9bd867da9988e213394a396
2014-03-06 10:54:15 -05:00
Steve Harris
069093884f
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
...
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 889200c9eb3fbb835f8fef067476799f30a7a7e0
2014-03-06 08:39:43 -06:00
Lee Venable
e71dad9c80
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: eb3cf0ade9203766a437512b85e55f32108db1e3
2014-03-05 08:37:13 -06:00
Brian.Dyke
1d92e5bab6
OB_14.1.1-21 baseline
...
Former-commit-id: d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b
2014-03-04 11:47:42 -05:00
Lee Venable
28fe1e99e2
Issue #2795 - removed test code.
...
Former-commit-id: 0e1db42a04b15b8815d59db272b4b2f7b3e79fb9
2014-02-27 15:46:30 -06:00
Richard Peter
86d42ed603
Issue #2509 : Fix Merge of 13.5.2-4 ncep resources
...
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: 08990cfd910707cbf1731a8f271a52ff922a6345
2014-02-27 13:46:47 -06:00
Richard Peter
729d608a15
Issue #2509 : Fix merge of SS #124
...
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1
Former-commit-id: 998ccfc1af2ca9c217151f353a8617ace8a1c18c
2014-02-27 13:20:49 -06:00
Brian.Dyke
324696c436
OB_14.1.1-20 baseline
...
Former-commit-id: bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de
2014-02-26 17:39:15 -05:00
Lee Venable
0c7395d423
Issue #2795 - added code to check for null images.
...
Former-commit-id: 64cde69f612f25bf6c4a60db24791e3842b956a9
2014-02-26 15:50:46 -06:00
Lee Venable
94cede8153
Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
...
Former-commit-id: a075d26c10bf7459419180f416d3e9ccefb94075
2014-02-26 13:21:58 -06:00
Nate Jensen
279f05a1d5
Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
...
Former-commit-id: 5ce14324c20f4c73f77c827dc2991381acca813c
2014-02-24 16:17:20 -06:00
Nate Jensen
8a00a419a1
Issue #2830 sort TAF dataTimes so latest are retrieved
...
Former-commit-id: 04db02beec9d77e568c76541448bce0cd2f6c2d0
2014-02-24 15:35:13 -06:00
Brian.Dyke
2faab606e5
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
...
Former-commit-id: f7a43d07109a7c04ffb9754c285043ce446d46b5
2014-02-24 14:51:00 -05:00
Ron Anderson
4364e7497c
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Conflicts:
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962
Former-commit-id: 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d
2014-02-24 13:46:48 -06:00
Brian.Dyke
cfa4997978
OB_14.1.1-19 baseline
...
Former-commit-id: db2a591456383d8f980d33757e8c161bdcc01d3a
2014-02-21 06:50:59 -05:00
Nate Jensen
32bd9fd635
Issue #2704 fix startup issues where settings are valid but dialog
...
doens't realize it
Former-commit-id: 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1
2014-02-20 10:53:21 -06:00
