Brian.Dyke
0bbf137b05
Merge branch 'fun_merge' into master_14.2.1
...
Former-commit-id: 6414bdab57312cd8a3e8
2014-03-07 08:57:07 -05:00
Brian.Dyke
7baa5ee0d5
Merge 13.5.3 DR_16824
...
Former-commit-id: dafe7e6a42b8fd0f16ed
2014-03-06 11:22:08 -05:00
Brian.Dyke
26fe429c4b
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
...
Former-commit-id: 010b7a1df51778d20745
2014-03-06 11:04:34 -05:00
Brian.Dyke
6313b7af0c
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
...
Former-commit-id: cb1b4a7ac52dbac1697d
2014-03-06 10:56:44 -05:00
Brian.Dyke
bd81ebd8c2
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: eefe8c45fedb274c890f
2014-03-06 10:54:15 -05:00
Steve Harris
3ba28aabea
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: ffcc34f8d4069093884f
2014-03-06 08:39:43 -06:00
Brian.Dyke
271ec85c0c
OB_14.1.1-21 baseline
...
Former-commit-id: 29681c7ca41d92e5bab6
2014-03-04 11:47:42 -05:00
Brian.Dyke
b2401d2f0d
OB_14.1.1-20 baseline
...
Former-commit-id: 2bad40cfee324696c436
2014-02-26 17:39:15 -05:00
Brian.Dyke
363403fb34
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
...
Former-commit-id: 1a8a0b703e2faab606e5
2014-02-24 14:51:00 -05:00
Brian.Dyke
779553142c
OB_14.1.1-19 baseline
...
Former-commit-id: 10b723647bcfa4997978
2014-02-21 06:50:59 -05:00
Brian.Dyke
5f3ca0a3f4
ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
...
Former-commit-id: 916f657e042f79cc486e
2014-02-20 15:50:50 -05:00
David Gillingham
607ce13c19
Issue #2783 : Rewrite run_report_alarm script into EDEX service.
...
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: de12904c7a32719432ff
2014-02-18 13:24:37 -06:00
Richard Peter
c666adb530
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: d19e464a1a3ed6ad64ce
2014-02-18 12:44:57 -06:00
Lee Venable
e9226e7140
Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
...
Former-commit-id: 4e7c3c0cbe0cf2dba731
2014-02-18 12:19:41 -06:00
Brad Gonzales
49ddffc99b
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: 794bbc3c9b36a24c1cb5
2014-02-18 12:11:02 -06:00
Mike Duff
33f81d8822
Issue #2636 - Change how retrieval plan is updated over time.
...
Peer review comments
Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950
Former-commit-id: 911789b91089bd047283
2014-02-18 12:05:26 -06:00
Brad Gonzales
379c0fb46c
Issue #2771 For Data Delivery CAVE now request current id from
...
the registry EDEX. Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.
Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
Created ClusterIdUtil. DataDeliveryIdUtil uses that utility. It also verifies the id against the awips sites.
Changed centralRegistry.sh to set CLUSTER_ID to NCF.
Handle cases where site id is HAK or HUS.
Check for empty id setting in Cluster ID Util.
Return full id for Data Delivery ID.
Simplify Data Delivery ID and return Cluster ID.
Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911
Former-commit-id: ba4e30832819460ed0d7
2014-02-18 11:10:44 -06:00
Ron Anderson
e7f2b6883d
Merge branch 'master_14.1.1' into master_14.2.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 14a082a4e932bcf9d0d0
2014-02-18 10:45:20 -06:00
Dave Hladky
24a4fab603
Issue #2786 Pending subscriptions don't work.
...
Former-commit-id: 7ee101d7c75c11dd09bb
2014-02-18 09:14:38 -06:00
Nate Jensen
0160ab0464
Issue #2704 fix alertviz connectivity checks
...
Former-commit-id: 4d689945250c4de50218
2014-02-17 17:10:07 -06:00
Nate Jensen
c8e70cd6b1
Issue #2812 made getHostname() use getWsId().getHostname for consistency
...
and working on windows
Former-commit-id: 2486e3919215ff4ab5d7
2014-02-17 11:58:04 -06:00
Nate Jensen
4583814741
Issue #2813 fix xml serialization of subscriptions
...
Former-commit-id: 83e9226419be75cc3731
2014-02-17 11:37:48 -06:00
Steve Harris
d0352c69d4
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 9fcc5ad930267cc881a4
2014-02-17 08:54:34 -06:00
Ron Anderson
ce8d59e075
Merge "Issue #2528 Fix display of data on somewhat identical projections. Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26" into omaha_14.2.1
...
Former-commit-id: 769c56bf08fae824482b
2014-02-17 08:56:48 -06:00
Mike Duff
43ea3b0918
Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
...
Former-commit-id: 346dc4afffac62d322ed
2014-02-14 08:53:40 -06:00
Ben Steffensmeier
2b30269ac9
Issue #2528 Fix display of data on somewhat identical projections.
...
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26
Former-commit-id: 23694f5e0c54a17c012d
2014-02-13 13:27:32 -06:00
Ron Anderson
21e95cc2f0
Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
...
Former-commit-id: 42fd9c8f9a51c9d27a39
2014-02-13 10:46:27 -06:00
Ron Anderson
3e78908bb5
Issue #2788 Fix topo for large areas.
...
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 2f067699f2fcf45916f4
2014-02-13 10:10:34 -06:00
Lee Venable
8073fd22b1
Issue #2773 - added code to help prevent eclipse bug from occurring.
...
Former-commit-id: ce08022db77099472204
2014-02-12 13:47:20 -06:00
Ron Anderson
8ba331e7fb
Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1
...
Former-commit-id: d906b780e8af4f8de839
2014-02-11 17:16:07 -06:00
Ron Anderson
0f9b44ff94
Issue #2719 Update NHA GFE domain
...
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c
Former-commit-id: ee89463d27a665530831
2014-02-11 17:07:01 -06:00
Brian.Dyke
f05a2220cd
14.1.1-18 baseline
...
Former-commit-id: 1d6a9456b7575e328123
2014-02-11 15:52:50 -05:00
Ben Steffensmeier
2952ae37a6
Issue #2765 Fix aliases for probability parameters.
...
Former-commit-id: 0bb18f2cd743a8b80ef2
2014-02-11 11:35:03 -06:00
Lee Venable
c7cfd49622
Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1
...
Former-commit-id: f078971b5d5c256dc19c
2014-02-11 09:15:44 -06:00
Nate Jensen
c28085118f
Issue #2704 smarter thin client connectivity dialog and connection
...
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: fd43d9e09575ca70fba6
2014-02-10 16:48:29 -06:00
Max Schenkelberg
3c1fafe328
Issue #2680 fixed samplers in structs issues with GLSL spec.
...
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9
Former-commit-id: a8a67634f97822511754
2014-02-10 13:43:16 -06:00
Lee Venable
d6fa79f1a7
Merge "Issue #2453 - Notification Center refactor" into omaha_14.2.1
...
Former-commit-id: 88a9d2031627be4297e6
2014-02-10 11:50:07 -06:00
Nate Jensen
d16d679809
Merge "Issue #2211 Fix data mapped sampling." into omaha_14.2.1
...
Former-commit-id: a48c1c67835c7c14a6c4
2014-02-10 09:53:41 -06:00
Ron Anderson
42850542af
Merge "Issue #2509 : Fix baseline merge breakage to ifpIMAGE." into omaha_14.2.1
...
Former-commit-id: 0476a288db2170fb5615
2014-02-10 08:31:31 -06:00
Mike Duff
61c57d2254
Issue #2453 - Notification Center refactor
...
Former-commit-id: 2c9d603e50eeb78f7f20
2014-02-07 16:50:50 -06:00
Ben Steffensmeier
d219a687c9
Issue #2211 Fix data mapped sampling.
...
Former-commit-id: 3d76d6655b724bb85676
2014-02-07 13:00:00 -06:00
David Gillingham
b12e29dd7c
Issue #2509 : Fix baseline merge breakage to ifpIMAGE.
...
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00
Former-commit-id: e8ffc7389303d36b8309
2014-02-07 09:51:42 -06:00
Brad Gonzales
9529c1d191
Issue #2636 Changed EdexBandwidthManager startup scheduling to use the
...
in-memory bandwidth manager to setup initial scheduling because it
is much faster.
Amend: updated log statement.
fix for rescheduling of already scheduled BandwidthAllocations.
Change-Id: I5c6d6543bce8222cb746fde2951caf6439db5fa3
Former-commit-id: 704e466f289c50fb29fd
2014-02-07 09:35:36 -06:00
Ben Steffensmeier
a26a150a69
Issue #2762 Fix Satellite Data Access.
...
Former-commit-id: ed2c1a03292166b5b696
2014-02-06 13:53:44 -06:00
Mike Duff
3707a4eabd
Issue #2636 - Fix for ncf spring config
...
Former-commit-id: e84ae264213f7defe563
2014-02-06 09:29:20 -06:00
Richard Peter
82fc0a2ed3
Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
...
Former-commit-id: 36d3d21b5764f0cabaef
2014-02-05 18:20:36 -06:00
Mike Duff
bafe19bbd5
Issue #2677 - Don't do overlap checks when updating subs to deactivated.
...
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd
Former-commit-id: 6b01c2957f101c08818d
2014-02-05 16:08:01 -06:00
Richard Peter
d1546d42ce
Merge "Issue #2722 - Add auto refresh to sub manager dialog" into omaha_14.2.1
...
Former-commit-id: 882544fec57e69f192a5
2014-02-05 14:57:16 -06:00
Dave Hladky
7fb7e10cda
Issue #2686 Refactor of retrieval
...
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558
Former-commit-id: 39f97723d66172c83afc
2014-02-05 14:49:26 -06:00
Steve Harris
1dbc316078
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 74c87b95c3f24bc49703
2014-02-05 09:12:40 -06:00
