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
Brian.Dyke
29681c7ca4
OB_14.1.1-21 baseline
...
Former-commit-id: d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b
2014-03-04 11:47:42 -05:00
Brian.Dyke
2bad40cfee
OB_14.1.1-20 baseline
...
Former-commit-id: bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de
2014-02-26 17:39:15 -05: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
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
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
Brad Gonzales
ba4e308328
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: d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb
2014-02-18 11:10:44 -06:00
Ron Anderson
14a082a4e9
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: 4155b9785e0a82078db6805659146980cafc2aa7
2014-02-18 10:45:20 -06:00
Dave Hladky
7ee101d7c7
Issue #2786 Pending subscriptions don't work.
...
Former-commit-id: e525b55b8bbe3ce0171b2a0484c7f7e5ed643d79
2014-02-18 09:14:38 -06:00
Nate Jensen
4d68994525
Issue #2704 fix alertviz connectivity checks
...
Former-commit-id: adfb9c293456aeced60e3ab41575d8b3b0f635b8
2014-02-17 17:10:07 -06:00
Nate Jensen
2486e39192
Issue #2812 made getHostname() use getWsId().getHostname for consistency
...
and working on windows
Former-commit-id: 6e020ed9403fcd2e1c27ed9ab8443497ba645933
2014-02-17 11:58:04 -06:00
Nate Jensen
83e9226419
Issue #2813 fix xml serialization of subscriptions
...
Former-commit-id: 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba
2014-02-17 11:37:48 -06:00
Steve Harris
9fcc5ad930
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: a494febee5f45d211797843d56077ac0ef358dbf
2014-02-17 08:54:34 -06:00
Ron Anderson
769c56bf08
Merge "Issue #2528 Fix display of data on somewhat identical projections. Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26" into omaha_14.2.1
...
Former-commit-id: ddb195c3032b80221e63f21eb113eaab5d50b124
2014-02-17 08:56:48 -06:00
Mike Duff
346dc4afff
Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
...
Former-commit-id: a2dcb434e8d72e0046c6af9900e0abd093f9bcbc
2014-02-14 08:53:40 -06:00
Ben Steffensmeier
23694f5e0c
Issue #2528 Fix display of data on somewhat identical projections.
...
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26
Former-commit-id: dfd408bdf6b4648ca9cd54fb12ed26f5ce8272aa
2014-02-13 13:27:32 -06:00
Ron Anderson
42fd9c8f9a
Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
...
Former-commit-id: 10bbf4bf6e5be7ff8bb138113991f7292a3390b1
2014-02-13 10:46:27 -06:00
Ron Anderson
2f067699f2
Issue #2788 Fix topo for large areas.
...
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad
2014-02-13 10:10:34 -06:00
Lee Venable
ce08022db7
Issue #2773 - added code to help prevent eclipse bug from occurring.
...
Former-commit-id: 7b3700b5ad07c677755844f969b5c31f31be138b
2014-02-12 13:47:20 -06:00
Ron Anderson
d906b780e8
Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1
...
Former-commit-id: caf31f2a88227c7ed9141676feb937822f4d03ce
2014-02-11 17:16:07 -06:00
Ron Anderson
ee89463d27
Issue #2719 Update NHA GFE domain
...
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c
Former-commit-id: 28008b46b5d68e544dace5f721b283c222701699
2014-02-11 17:07:01 -06:00
Brian.Dyke
1d6a9456b7
14.1.1-18 baseline
...
Former-commit-id: a8009c4ee3effc8586b830244db8db716ec0f37c
2014-02-11 15:52:50 -05:00
Ben Steffensmeier
0bb18f2cd7
Issue #2765 Fix aliases for probability parameters.
...
Former-commit-id: 11bbfb8275cfafb411d1d5d9732b021f0011712a
2014-02-11 11:35:03 -06:00
Lee Venable
f078971b5d
Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1
...
Former-commit-id: c75877624ab414c1a45bc7326c49aa99c8ec3021
2014-02-11 09:15:44 -06:00
Nate Jensen
fd43d9e095
Issue #2704 smarter thin client connectivity dialog and connection
...
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: 36d571557def95e0eb1350c4e68cbe3e225f282a
2014-02-10 16:48:29 -06:00
Max Schenkelberg
a8a67634f9
Issue #2680 fixed samplers in structs issues with GLSL spec.
...
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9
Former-commit-id: 4f3635fc682c2a1746e188dac0f371676c9e0be9
2014-02-10 13:43:16 -06:00
Lee Venable
88a9d20316
Merge "Issue #2453 - Notification Center refactor" into omaha_14.2.1
...
Former-commit-id: 213ecfda92272947cda51d9c3d00b117a3d52a76
2014-02-10 11:50:07 -06:00
Nate Jensen
a48c1c6783
Merge "Issue #2211 Fix data mapped sampling." into omaha_14.2.1
...
Former-commit-id: 1ae3057ce4fbbb5e60b27cf21d75de72b7e00c3e
2014-02-10 09:53:41 -06:00
Ron Anderson
0476a288db
Merge "Issue #2509 : Fix baseline merge breakage to ifpIMAGE." into omaha_14.2.1
...
Former-commit-id: ec8c9e963137ec7b7201558c5ddd00d2affb3aa3
2014-02-10 08:31:31 -06:00
Mike Duff
2c9d603e50
Issue #2453 - Notification Center refactor
...
Former-commit-id: f570a3945ad8e9e8bc4f88989a0ec10da191856a
2014-02-07 16:50:50 -06:00
Ben Steffensmeier
3d76d6655b
Issue #2211 Fix data mapped sampling.
...
Former-commit-id: aec317f506eb940e843a0c3cf4ffa55a83eb186b
2014-02-07 13:00:00 -06:00
David Gillingham
e8ffc73893
Issue #2509 : Fix baseline merge breakage to ifpIMAGE.
...
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00
Former-commit-id: 19e9a7f37409e37b378bf2f3eae0b9b16d797f65
2014-02-07 09:51:42 -06:00
Brad Gonzales
704e466f28
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: f1a4a7b24290b6e85380668563793ac529fc5b31
2014-02-07 09:35:36 -06:00
Ben Steffensmeier
ed2c1a0329
Issue #2762 Fix Satellite Data Access.
...
Former-commit-id: 4016e9366e8917225777b079da4b94dd1e6fde4a
2014-02-06 13:53:44 -06:00
Mike Duff
e84ae26421
Issue #2636 - Fix for ncf spring config
...
Former-commit-id: 4308e8a45d61e9d6a67b6036e98ff1b8886d86f6
2014-02-06 09:29:20 -06:00
Richard Peter
36d3d21b57
Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
...
Former-commit-id: daacb19de029a15f94338c84a85116d0435f79be
2014-02-05 18:20:36 -06:00
Mike Duff
6b01c2957f
Issue #2677 - Don't do overlap checks when updating subs to deactivated.
...
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd
Former-commit-id: 2e406f02b0abbdeee0f553df430f5a58977d9af2
2014-02-05 16:08:01 -06:00
Richard Peter
882544fec5
Merge "Issue #2722 - Add auto refresh to sub manager dialog" into omaha_14.2.1
...
Former-commit-id: 1e91683c1df918a7405c2f847a6dc7397dbcc473
2014-02-05 14:57:16 -06:00
Dave Hladky
39f97723d6
Issue #2686 Refactor of retrieval
...
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558
Former-commit-id: 0b85e00cecdca6c5dcb6deee138f1a002515ac3c
2014-02-05 14:49:26 -06:00
Steve Harris
74c87b95c3
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: cee2e11f4b3d74bee3ab254267f156a846801087
2014-02-05 09:12:40 -06:00
Richard Peter
e5af004993
Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1
...
Former-commit-id: a2536c180f68e5ea970e3406e3ef1f899650f3e2
2014-02-04 18:12:48 -06:00
Brian.Dyke
dad6f2896b
Issue #224
...
Former-commit-id: 043faa447b4fc15a996dfe6108093bed5f1b6497
2014-02-04 17:05:12 -05:00
Brian.Dyke
0cc11ddfd3
Issue #124
...
Former-commit-id: e192f01952d7779f03db819c0a04aa7f6cd0c88e
2014-02-04 16:56:47 -05:00
Brian.Dyke
b23c6f59f7
Issue #179
...
Former-commit-id: d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9
2014-02-04 16:53:34 -05:00
Brian.Dyke
35b25ee2a9
Issue #131
...
Former-commit-id: 4167f33801ee2450502231438955e72c4428fbcc
2014-02-04 16:36:11 -05:00
