Brian.Dyke
c6f2010ce6
Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 0e02910adc2ef73df2eff5b41c1e9945a5536a0a
2014-03-10 15:42:38 -04: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
Brian.Dyke
d710aec521
Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: ac54324fb0eff1483dd2c3aa8d94273760451dab
2014-03-10 15:14:59 -04:00
Stephen Gilbert
65dd8b4c3c
VLab Issue #3224 - NSHARP: Fix erroneous mixing heights
...
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2
Former-commit-id: 459cd2e6772efa05a683073798a1d4424aa2facf
2014-03-07 19:10:08 -05:00
Stephen Gilbert
9a457213bb
VLab Issue #3223 - NSHARP: Improve selection operation
...
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d
Former-commit-id: 16fcc171c65d79d5698feeb3ff0ace49c31d976f
2014-03-07 19:07:28 -05:00
Stephen Gilbert
1632166902
VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP
...
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57
Former-commit-id: 24e07a3215a7879e459afc74e020eab0a8e1c646
2014-03-07 18:49:21 -05:00
Stephen Gilbert
625fcb0064
VLab Issue #3221 - Fix XML serialization problems
...
A few problems reading/writing XML files were noticed after upgrading to
14.2.1. This commit fixes the saving of SPFs, reading of image style
rules, and the location of lockedColorMap file.
Change-Id: I8aad4197029c70f72612299a25329687892884af
Former-commit-id: 4f58998c899e28521658bf17dee852592c534713
2014-03-07 18:36:42 -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
41a4905f9f
ASM #224 - WarnGen: OB13.5.2 Template Errors
...
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28
Former-commit-id: b18b8f64040b1c41810f391b8ed785327b6e5d59
2014-03-07 14:53:54 -05:00
Shawn.Hooper
670da1895b
ASM #377 - Baseline National River Location Database fails
...
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae
Former-commit-id: 5dcb5b019f389e64435b0283d95fe477032d88cc
2014-03-07 13:12:11 -05: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
3ac2a61218
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 8b6d5b889e652cbf82c66ae831c9c116626c1494
2014-03-07 11:50:06 -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
David Friedman
11d0d191fd
ASM #74 - Fix RadarServer configuration import utility JAR dependency
...
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70
Former-commit-id: 1a4183ed991cf1aed5895334c7b823a66ad58a7a
2014-03-06 17:07:23 +00:00
Brian.Dyke
b8fd0f16ed
Merge 13.5.3 DR_16824
...
Former-commit-id: 1b9ed749da0d1893f44e68400644f37c763e324a
2014-03-06 11:22:08 -05:00
Brian.Dyke
1778d20745
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
...
Former-commit-id: 85700a6c632125b5f1d36b37a70767fbd9819142
2014-03-06 11:04:34 -05:00
Brian.Dyke
2dbac1697d
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
...
Former-commit-id: c1dc533bf7ee6500da3f6d75699ad7758a39462b
2014-03-06 10:56:44 -05: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
Steve Harris
167ce61d6c
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 505bcf7b47aac1344bb46bac690ce83591b8e554
2014-03-05 13:00:23 -06:00
Lee Venable
e71dad9c80
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: eb3cf0ade9203766a437512b85e55f32108db1e3
2014-03-05 08:37:13 -06:00
Benjamin Phillippe
59323be87e
Issue #2769 : Added batching to registry sync
...
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db
Former-commit-id: a265027cacde7690171d30455227c5a843e0d397
2014-03-04 13:31:41 -06:00
Richard Peter
aa8e1a3625
Merge "Issue #2769 : Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
...
Former-commit-id: 26cbe68f0a86660968016da88a4b51d1735e8227
2014-03-04 12:54:23 -06:00
Nate Jensen
0ec866f1d2
Issue #2813 fix subscription package names
...
Former-commit-id: 081b621b5932d77c03117840e887ed7017f1d48b
2014-03-04 10:53:58 -06:00
Brian.Dyke
1d92e5bab6
OB_14.1.1-21 baseline
...
Former-commit-id: d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b
2014-03-04 11:47:42 -05:00
Benjamin Phillippe
ed050996a2
Issue #2769 : Registry database deadlocking fixes/performance improvements
...
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0
Former-commit-id: a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e
2014-03-03 10:57:16 -06: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
Steve Harris
5218a4d1e6
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 2f2339f4c12e1862d27a8dda65264f353aed6ac6
2014-02-27 10:02:43 -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
Richard Peter
3735cd3ffe
Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
...
Former-commit-id: 937157a12ca783ead50ad4ddaec4e1679ea47e62
2014-02-25 12:34:38 -06:00
Brad Gonzales
783afb1585
Issue #2386 fixed spatial overlap rule application.
...
Amend: updates from peer review.
Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22
Former-commit-id: 807f278d542bc36331aa83b46a86a3af9dbb6675
2014-02-25 09:22:08 -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
Nate Jensen
2111109ce2
Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
...
Former-commit-id: cd4472f65c07f28d6aee26df748d44568405a9b1
2014-02-24 13:25:35 -06:00
Dave Hladky
1d256bfcee
Issue #2469 Fixed default rules implementation
...
Former-commit-id: 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72
2014-02-24 13:06:52 -06:00
Ben Steffensmeier
9e5f7d90a0
Issue #2762 Use UCUM to format units so IRPixel formats correctly.
...
Former-commit-id: b5949935eaa071ec2a56c48f32fbc3a4714d2056
2014-02-24 10:27:30 -06:00
Dave Hladky
c4bed432da
Issue #2636 Try Catch around the MaintTask
...
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285
Former-commit-id: 60c9027b219f3de7193320e5a55911c740e58f30
2014-02-21 16:01:20 -06:00
Brian.Dyke
cfa4997978
OB_14.1.1-19 baseline
...
Former-commit-id: db2a591456383d8f980d33757e8c161bdcc01d3a
2014-02-21 06:50:59 -05:00
Brian.Dyke
2f79cc486e
ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
...
Former-commit-id: 370617bc1cbcf768b07b676870cfaa5e2cad49bc
2014-02-20 15:50:50 -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
David Gillingham
32719432ff
Issue #2783 : Rewrite run_report_alarm script into EDEX service.
...
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd
2014-02-18 13:24:37 -06:00
