Steve Harris
a2e36f4c6c
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 22538918b8a7175bbb517cbf65ec3738e65a6eb2
2014-03-06 18:19:55 -06:00
Juliya Dynina
a5514689cd
Merge "ASM #329 - 'County/Zone names missing' error for counties with a - (hyphen)" into asm_14.2.2
...
Former-commit-id: 165999c4d3048b27d97cf530ec21051721c9747c
2014-03-06 15:53:31 -05:00
David Friedman
d08597a0d4
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
dafe7e6a42
Merge 13.5.3 DR_16824
...
Former-commit-id: 1b9ed749da0d1893f44e68400644f37c763e324a
2014-03-06 11:22:08 -05:00
Brian.Dyke
010b7a1df5
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
cb1b4a7ac5
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
eefe8c45fe
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: 1edba9216beac913f9bd867da9988e213394a396
2014-03-06 10:54:15 -05:00
Steve Harris
ffcc34f8d4
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
Qinglu.Lin
e9d6eae852
ASM #329 - 'County/Zone names missing' error for counties with a - (hyphen)
...
Change-Id: I438fe078be9161e58faebc25b03f8416e9f00319
Former-commit-id: 5ffc345efdc6d1d9fabf522f3247a1f1c4f62d6b
2014-03-05 16:51:03 -05:00
Steve Harris
4b01c57c0a
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
980e21ca5a
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: eb3cf0ade9203766a437512b85e55f32108db1e3
2014-03-05 08:37:13 -06:00
Benjamin Phillippe
9fd35140f0
Issue #2769 : Added batching to registry sync
...
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db
Former-commit-id: a265027cacde7690171d30455227c5a843e0d397
2014-03-04 13:31:41 -06:00
Richard Peter
f9bd27c061
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
John.McPherson
2d8ce4e577
ASM #113 DR 16464 rsync_parms.site may not always exist for Service Backup
...
Change-Id: I2abbb68dcbd064483a262ddba4b9ab9e0dee211a
Former-commit-id: 4d9b74dc181c359681eda8bae04f7c46f41d5769
2014-03-04 17:24:00 +00:00
Nate Jensen
d7d0803ee9
Issue #2813 fix subscription package names
...
Former-commit-id: 081b621b5932d77c03117840e887ed7017f1d48b
2014-03-04 10:53:58 -06:00
Brian.Dyke
29681c7ca4
OB_14.1.1-21 baseline
...
Former-commit-id: d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b
2014-03-04 11:47:42 -05:00
Benjamin Phillippe
5483d6d7ae
Issue #2769 : Registry database deadlocking fixes/performance improvements
...
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0
Former-commit-id: a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e
2014-03-03 10:57:16 -06:00
Juliya Dynina
4bc91be899
Merge "ASM #78 - Fix MDCRS display" into asm_14.2.2
...
Former-commit-id: 081b98f0e1a2dad2d4aff981cbe9980e0c97e12a
2014-03-03 11:27:39 -05:00
Lee Venable
f94bcc4d3f
Issue #2795 - removed test code.
...
Former-commit-id: 0e1db42a04b15b8815d59db272b4b2f7b3e79fb9
2014-02-27 15:46:30 -06:00
Richard Peter
862069dfd3
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
d54fee5dae
Issue #2509 : Fix merge of SS #124
...
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1
Former-commit-id: 998ccfc1af2ca9c217151f353a8617ace8a1c18c
2014-02-27 13:20:49 -06:00
Mike Duff
42982306ab
Issue #2842 - Fix MPE tearoff menu issues, add next/prev hr toolbar buttons
...
Change-Id: Ic16bc87680918a1a462bcd5373e8f92faf6d905d
Former-commit-id: 048b3ab40864d13baa7bcd9c8aef04564ec8a5f9
2014-02-27 12:01:30 -06:00
Melissa Porricel
e5213e9415
ASM #78 - Fix MDCRS display
...
Change-Id: I28b6788f822100469f0fe292197b6020381e6e38
Former-commit-id: 2c655d5313882f811219c7a16f713d977008f949
2014-02-27 12:48:09 -05:00
Steve Harris
99f53876d7
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 2f2339f4c12e1862d27a8dda65264f353aed6ac6
2014-02-27 10:02:43 -06:00
Juliya Dynina
09708ce0ba
Merge "ASM #236 " into asm_14.2.2
...
Former-commit-id: 8ddc79c66a4131f9671b605057abf916200a276a
2014-02-27 09:48:01 -05:00
Brian.Dyke
2bad40cfee
OB_14.1.1-20 baseline
...
Former-commit-id: bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de
2014-02-26 17:39:15 -05:00
Lee Venable
49530206f4
Issue #2795 - added code to check for null images.
...
Former-commit-id: 64cde69f612f25bf6c4a60db24791e3842b956a9
2014-02-26 15:50:46 -06:00
Lee Venable
e0ee93bab3
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
steve.naples
cc9e62c806
ASM #236
...
Change-Id: I849aa9c15622973e49f385ada9df84ba3b1417dd
Former-commit-id: 8d0e82a46186f3457c5d4e3001548d067ebbaae2
2014-02-26 18:54:36 +00:00
Richard Peter
b4e48698ed
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
8b2b50baaf
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
Daniel.Huffman
a34124c355
ASM #76
...
Added lpi resources. File latLonOcean.xml is an example.
Change-Id: I533aa7616d837a70d2b14a4bbe00397ef2a7ddff
Former-commit-id: 733a80d0019ccf7f5529abbd6054cb485412e962
2014-02-24 22:59:41 +00:00
Nate Jensen
060eafc272
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
f353c44cc0
Issue #2830 sort TAF dataTimes so latest are retrieved
...
Former-commit-id: 04db02beec9d77e568c76541448bce0cd2f6c2d0
2014-02-24 15:35:13 -06:00
Brian.Dyke
1a8a0b703e
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
2db5f26840
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
b1586f8603
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
45413d0db4
Issue #2469 Fixed default rules implementation
...
Former-commit-id: 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72
2014-02-24 13:06:52 -06:00
Ben Steffensmeier
f8cc0e3d95
Issue #2762 Use UCUM to format units so IRPixel formats correctly.
...
Former-commit-id: b5949935eaa071ec2a56c48f32fbc3a4714d2056
2014-02-24 10:27:30 -06:00
John.McPherson
bbd70c06f1
ASM #209 DR 16362
...
Change-Id: Ide103349188f12f3b1350bea75f80b225def13e7
Former-commit-id: b01f04471631f5e2c24dba77f7e96b72444becff
2014-02-24 03:07:21 +00:00
Dave Hladky
49f6c31256
Issue #2636 Try Catch around the MaintTask
...
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285
Former-commit-id: 60c9027b219f3de7193320e5a55911c740e58f30
2014-02-21 16:01:20 -06:00
Brian.Dyke
10b723647b
OB_14.1.1-19 baseline
...
Former-commit-id: db2a591456383d8f980d33757e8c161bdcc01d3a
2014-02-21 06:50:59 -05:00
Brian.Dyke
916f657e04
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
0f81b80467
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
Juliya Dynina
f1a10568d6
Merge "ASM #118 " into asm_14.2.2
...
Former-commit-id: f2354898d0a40ae7a19b4349d25b4204d2da3e4d
2014-02-20 11:23:32 -05:00
David Gillingham
de12904c7a
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
Richard Peter
d19e464a1a
Merge "Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues." into omaha_14.2.1
...
Former-commit-id: 5bf461753675af961c484d022cec4006fabfeba8
2014-02-18 12:44:57 -06:00
Lee Venable
4e7c3c0cbe
Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
...
Former-commit-id: 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21
2014-02-18 12:19:41 -06:00
Brad Gonzales
794bbc3c9b
Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues.
...
Amend: updated test envlope sizes.
fixed ticket numbers in software history.
Change-Id: Id2fa1638d31e3b03092587769063123c838c49c5
Former-commit-id: 4c3148df4e85ccfa1d5b123fcb605d97249833d7
2014-02-18 12:11:02 -06:00
Mike Duff
911789b910
Issue #2636 - Change how retrieval plan is updated over time.
...
Peer review comments
Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950
Former-commit-id: 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5
2014-02-18 12:05:26 -06:00
