Steve Harris
1c13496912
Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
...
Former-commit-id: 9ff30774359132d9004eeb2f2865fe9ff30774359132d9004eeb2f2865fe5bf5bdb6b0eb2f2865fe5bf5bdb6b01f3584ce156ed279d306c361ccd5319be8c87f87ac077b24a1
2014-04-15 09:39:33 -05:00
Benjamin Phillippe
372ecda418
Issue #3011 Fixed replication slowdown
...
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 575caa6238490413551b3db751fc5b575caa6238490413551b3db751fc5b62062bf2883db751fc5b62062bf288f731dbc8470b149f92d9035272360bf6f51d3575f026a17b07
2014-04-15 09:15:12 -05:00
Brian.Dyke
f77319aa5b
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: b6e4e2339473be1016c08c2f601b59b6e4e2339473be1016c08c2f601b599cce8eb0d18c2f601b599cce8eb0d170e228a893afc1da9015ff51498036f051b95a7afbefee3e1d
2014-04-10 13:26:42 -04:00
Richard Peter
52a54f5e9f
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: efd1003a50567609044395eba8dcf6efd1003a50567609044395eba8dcf6b15d28853095eba8dcf6b15d28853047795836f2f1b85f696473aab15d85b667e0509f421b2716a4
2014-04-09 16:00:54 -05:00
Brian.Dyke
38a8f60a43
Merged 1354 -7 and -8 into 1412
...
Former-commit-id: 7de936dfbae4136f79dd947194c9987de936dfbae4136f79dd947194c998929b736038947194c998929b736038a6ebdbfc3ad76d3a26cb5163a31a66462952ce658ef50f023b
2014-04-09 11:39:07 -04:00
Brian.Dyke
ae3f5dbff6
Merged 1354 -5 and -6 into 1412 based on 1411-25
...
Former-commit-id: 2eec862ebb17477e7db16a28fcb1562eec862ebb17477e7db16a28fcb156dd98c213c76a28fcb156dd98c213c78ba2694d8e47d90952119f37f61cf8be574897cc39b5e7fe67
2014-04-04 12:57:32 -04:00
Richard Peter
0f5b3cac88
Issue #2509 : Fix stitched grid notifications
...
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4
Former-commit-id: 9536a08425bfba75f73f53d50002619536a08425bfba75f73f53d5000261f99875040c53d5000261f99875040ce5d60b407eb32eff04be9ac8af6ccd154034d653034e62d64e
2014-04-01 14:44:05 -05:00
David Gillingham
be6e42d91b
Issue #2418 : Re-implement GFE support for pSurge 2.0 data to match A1.
...
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9
Former-commit-id: d14aee89aa402adfeddba529bc8cadd14aee89aa402adfeddba529bc8cad70b28b4e1ea529bc8cad70b28b4e1e13017ce73164981356c822266d36b93ad0872bda14f927fe54
2014-03-31 15:49:33 -05:00
Brian.Dyke
dedbdef64c
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: 7ca114f7f1a1b980a15d6346c9776b7ca114f7f1a1b980a15d6346c9776b3b639347f86346c9776b3b639347f8bded86a35f519ec3071a76625c22389fa73765f9102414db3a
2014-03-27 10:22:26 -04:00
Steve Harris
9659705737
Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
...
Former-commit-id: e621e81f209cf3600ff64879520391e621e81f209cf3600ff64879520391a7efde7cf44879520391a7efde7cf43b8569a1ac311c8d67af55440888fdaf32adebc5ef058152a0
2014-03-26 15:51:32 -05:00
Richard Peter
989ac3147f
Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1
...
Former-commit-id: d4c67a0f8c6236137635390e73af44d4c67a0f8c6236137635390e73af44897980da08390e73af44897980da085dd2d089bba910870531780b5042519060aab6dd631aa74a10
2014-03-24 09:53:13 -05:00
Dave Hladky
a6d07e82a6
Issue #2939 Madis data mismatches
...
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 912c7e2d1239343e18013ac04dd071912c7e2d1239343e18013ac04dd0719f3c5dcc423ac04dd0719f3c5dcc42c978694653e464a1d8f843cbcff5383d61ca32f6a37f87968c
2014-03-24 08:27:12 -05:00
Mike Duff
b1e31e388d
Issue #2941 - Sort data before returning
...
Former-commit-id: d7d06e18fdff07b9065973a011b940d7d06e18fdff07b9065973a011b9404db73e42a573a011b9404db73e42a5b26be09c498d1347d1f743eccead7c8f00b3768805fbcc61ca
2014-03-24 08:19:21 -05:00
Brian.Dyke
91da395a71
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 674036b17250e5f4f78d06ee9a6384674036b17250e5f4f78d06ee9a638407b2e04d7a06ee9a638407b2e04d7a402035e7f9d97b88f43314567f20a7f540c6fb2daea0544eec
2014-03-24 07:01:29 -04:00
Brian.Dyke
1f96787564
OB_14.1.1-24 baseline
...
Former-commit-id: 8366e88db137e9d48d4537b63682688366e88db137e9d48d4537b6368268face1ebeeb37b6368268face1ebeeb49f7c81de1cfa058a3456b2175da932fda566cfb7aeb9af309
2014-03-21 12:43:50 -04:00
Brian.Dyke
f95e1ed18b
Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: e85e3c2e709f332e938cd23acbdd48e85e3c2e709f332e938cd23acbdd489c412e444ed23acbdd489c412e444e39ef07d49f57f7e4b08488efccf30935427557c45fb2fe9266
2014-03-14 11:13:30 -04:00
Brian.Dyke
b6b38c0121
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: a68bda68584e3096631dd4b6d22ae2a68bda68584e3096631dd4b6d22ae2f999e48df0d4b6d22ae2f999e48df086ec9a50d482756e38553ab2df350776271269c5516ba8e81a
2014-03-14 08:44:39 -04:00
Brian.Dyke
f417ded1bb
OB_14.1.1-23 baseline
...
Former-commit-id: b24e7a66d855918ee421dcc2e4fd61b24e7a66d855918ee421dcc2e4fd61bc6a7bf946dcc2e4fd61bc6a7bf9466c021d0eece78e030b7c8f72db144bc7fbd5dfe4be8f052cff
2014-03-14 08:18:16 -04:00
Ben Steffensmeier
b6b13cea10
Issue #2528 Fix satellite units/style.
...
Former-commit-id: eb922ea2e2e6cd8b316777041e5b17eb922ea2e2e6cd8b316777041e5b1775120a09cd77041e5b1775120a09cd82a8490dfce2995114dcd29daf8edefc62e2679d1bde438f3a
2014-03-12 14:19:49 -05:00
Richard Peter
64feddc462
Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
...
Former-commit-id: 4d5c7e49f9e981ce3e3618234c5d734d5c7e49f9e981ce3e3618234c5d73f59d1433db18234c5d73f59d1433db90f3b627afcc35481b4876f15c73dd937c89866d318c61b1bf
2014-03-11 16:43:37 -05:00
Dave Hladky
177e76f996
Issue #2678 end retrieval double clutching
...
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc
Former-commit-id: b440063bb97cd43041403500ad262ab440063bb97cd43041403500ad262a76e216d3193500ad262a76e216d31939cc47bc52f3876233e403fd32144ac0d2eb8f6b78441a1250
2014-03-11 15:53:59 -05:00
David Gillingham
7c4f0bcee6
Issue #2509 : Fix static topo generation break caused by baseline merge.
...
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68
Former-commit-id: 751d8956a9e3a3cf7badb0783b64ce751d8956a9e3a3cf7badb0783b64ce187196b519b0783b64ce187196b5196fcb5b7e734179172d0e68edb8d9a1f30292b4710e0fdae804
2014-03-11 11:54:25 -05:00
Juliya Dynina
98b24cf46b
Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1
...
Former-commit-id: 2b55a4240eb3ec4c363f6bbd88e62c2b55a4240eb3ec4c363f6bbd88e62c79528624436bbd88e62c7952862443d1b202fcd0bedc9082b07e35f366517966aac771ddf1c4f4f6
2014-03-11 09:24:12 -05:00
brian.dyke
3b1dd43698
Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
...
Former-commit-id: 730491d4bb1a482f91bc654778bb0d730491d4bb1a482f91bc654778bb0db1b216f196654778bb0db1b216f19641a37605d4d1b389ae05d57a3dd24cf3df3e3690fba0188c90
2014-03-10 15:36:56 -04:00
Steve Harris
3348f6857a
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: da2d7fc334068297b90a92232fa063da2d7fc334068297b90a92232fa06340b543f9a892232fa06340b543f9a8a94f8003244d1fbf8743f992a6b046ea01373320e29b96b6bd
2014-03-07 15:16:18 -06:00
Shawn.Hooper
671d334f18
ASM #224 - WarnGen: OB13.5.2 Template Errors
...
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28
Former-commit-id: bd02f6a1a6e894b1279a41a4905f9fbd02f6a1a6e894b1279a41a4905f9f56a949fba841a4905f9f56a949fba81acdbf20f284b71d7252aa827610b1fb673d390fdf59dabcb5
2014-03-07 14:53:54 -05:00
David Friedman
87ed26568e
ASM #349 - Workaround for QPID-5569
...
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce
Former-commit-id: b8aadf1781103fece7b72c1a3442d6b8aadf1781103fece7b72c1a3442d6a58f3cb7df2c1a3442d6a58f3cb7df951bd668ae91b22ff9bb2a4a92c223ab5f533c722eb0b3dfb0
2014-03-07 14:58:09 +00:00
Steve Harris
a19beb1e5d
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: 52226061e93ba28aabea069093884f52226061e93ba28aabea069093884fffcc34f8d4069093884fffcc34f8d4d2a6b0c18b587f15a95d96658d8ce036a0533f192db5dcf6eb
2014-03-06 08:39:43 -06:00
Benjamin Phillippe
d51e7a67a0
Issue #2769 : Added batching to registry sync
...
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db
Former-commit-id: 7ad21da0897bf51d507e59323be87e7ad21da0897bf51d507e59323be87e9fd35140f059323be87e9fd35140f0fe6d70a38fdaeb8bec5fcd04d7dcbe6b6a5b0e4fd0999c05e8
2014-03-04 13:31:41 -06:00
Richard Peter
f451950ced
Merge "Issue #2769 : Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
...
Former-commit-id: 2b5339e16f5280398130aa8e1a36252b5339e16f5280398130aa8e1a3625f9bd27c061aa8e1a3625f9bd27c06175f96fe190a81447f4343b800bcc099ce19b16cc0219b80555
2014-03-04 12:54:23 -06:00
Nate Jensen
587d8e5e1b
Issue #2813 fix subscription package names
...
Former-commit-id: 645fec513aaf76b58b270ec866f1d2645fec513aaf76b58b270ec866f1d2d7d0803ee90ec866f1d2d7d0803ee9b920fdd0aa78b2b50370df44f8246ee22b486f255132a0f8cb
2014-03-04 10:53:58 -06:00
Brian.Dyke
c8111a7ebb
OB_14.1.1-21 baseline
...
Former-commit-id: 5179a4f970271ec85c0c1d92e5bab65179a4f970271ec85c0c1d92e5bab629681c7ca41d92e5bab629681c7ca4c1ef56e0d7c68649b4f97cad374af5079cc93f89ea56516bf5
2014-03-04 11:47:42 -05:00
Benjamin Phillippe
eb7e448d08
Issue #2769 : Registry database deadlocking fixes/performance improvements
...
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0
Former-commit-id: ea31c5b370d339e232f4ed050996a2ea31c5b370d339e232f4ed050996a25483d6d7aeed050996a25483d6d7ae71d5fbda33603e43305415a5e7c4a4090dbe3918719b90e1e7
2014-03-03 10:57:16 -06:00
Brian.Dyke
7316b34ef5
OB_14.1.1-20 baseline
...
Former-commit-id: 2613e13e08b2401d2f0d324696c4362613e13e08b2401d2f0d324696c4362bad40cfee324696c4362bad40cfee89b66fcb5bc873f20d0416117255f35feadbe4d9f9587d39d1
2014-02-26 17:39:15 -05:00
Richard Peter
aac768e805
Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
...
Former-commit-id: 2c433bb05c90b48e03933735cd3ffe2c433bb05c90b48e03933735cd3ffeb4e48698ed3735cd3ffeb4e48698ed85a16601edf803d557c266b271a550e78e5a15b9e28b3bb5b9
2014-02-25 12:34:38 -06:00
Brad Gonzales
ac050068d5
Issue #2386 fixed spatial overlap rule application.
...
Amend: updates from peer review.
Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22
Former-commit-id: 39afe190e0b6e2ce4b74783afb158539afe190e0b6e2ce4b74783afb15858b2b50baaf783afb15858b2b50baafc364269faef57f472f6a5ce1939d01f4513d0e64aa2d8b76a1
2014-02-25 09:22:08 -06:00
Brian.Dyke
9db7ca881a
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
...
Former-commit-id: 9158806dd2363403fb342faab606e59158806dd2363403fb342faab606e51a8a0b703e2faab606e51a8a0b703e6b1b6d38e373a1c238f4227131e5f138829b90140bcf7c89b8
2014-02-24 14:51:00 -05:00
Ron Anderson
5eb76e8ed6
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: 049424e5f045ccac08594364e7497c049424e5f045ccac08594364e7497c2db5f268404364e7497c2db5f268405831f8d79e7d3af157f83b2ea2d6acf2b0cc20e83c673caec2
2014-02-24 13:46:48 -06:00
Nate Jensen
0d8cd5360a
Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
...
Former-commit-id: 4af8a7f32698a6101cd32111109ce24af8a7f32698a6101cd32111109ce2b1586f86032111109ce2b1586f86031837a83743d6e9cb73f5bf8bb95f516979321635da2a363550
2014-02-24 13:25:35 -06:00
Dave Hladky
2ed6aabcb0
Issue #2469 Fixed default rules implementation
...
Former-commit-id: d31708962bf9c6a396f01d256bfceed31708962bf9c6a396f01d256bfcee45413d0db41d256bfcee45413d0db405c81677d2dc97eb7890ff5a5961db8a924bcc2ce030ac65b2
2014-02-24 13:06:52 -06:00
Ben Steffensmeier
762a32fab9
Issue #2762 Use UCUM to format units so IRPixel formats correctly.
...
Former-commit-id: 669b580920f7c48b24bb9e5f7d90a0669b580920f7c48b24bb9e5f7d90a0f8cc0e3d959e5f7d90a0f8cc0e3d9559c34458ff3c7e578000a510abdb22358e7d3b1d831bb0b021
2014-02-24 10:27:30 -06:00
Dave Hladky
15edb8e522
Issue #2636 Try Catch around the MaintTask
...
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285
Former-commit-id: cd7934e12f542ba7e504c4bed432dacd7934e12f542ba7e504c4bed432da49f6c31256c4bed432da49f6c31256e15d2f50f93b9f80d03e445b55f796c545368839c4e70210fd
2014-02-21 16:01:20 -06:00
Brian.Dyke
de9e6553a9
OB_14.1.1-19 baseline
...
Former-commit-id: 3508e488f5779553142ccfa49979783508e488f5779553142ccfa499797810b723647bcfa499797810b723647b5a11fbbfdbc41dd22ff264044e7ce51b359c2564f86f9f8918
2014-02-21 06:50:59 -05:00
David Gillingham
da665e15b0
Issue #2783 : Rewrite run_report_alarm script into EDEX service.
...
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: 43733c77eb607ce13c1932719432ff43733c77eb607ce13c1932719432ffde12904c7a32719432ffde12904c7ab373d71852a83191356d1520317c24474dda75de5911f4b2d4
2014-02-18 13:24:37 -06:00
Richard Peter
fac7168aac
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: 4dcb9b321dc666adb5303ed6ad64ce4dcb9b321dc666adb5303ed6ad64ced19e464a1a3ed6ad64ced19e464a1aba1cb2a9cff7e43bdabd3c4e188037ccd90f2d86bbce2567a7
2014-02-18 12:44:57 -06:00
Lee Venable
80ef62e8fd
Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
...
Former-commit-id: f81d0d88b8e9226e71400cf2dba731f81d0d88b8e9226e71400cf2dba7314e7c3c0cbe0cf2dba7314e7c3c0cbeab57d3efe746dbd967a56fc9dcb3b128b0809a1c0bd01db3cc
2014-02-18 12:19:41 -06:00
Brad Gonzales
d899777a6d
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: b0f71efecc49ddffc99b36a24c1cb5b0f71efecc49ddffc99b36a24c1cb5794bbc3c9b36a24c1cb5794bbc3c9b2330bf10b23bb997572890d34f7386b99b5d9373d50a8cd7a5
2014-02-18 12:11:02 -06:00
Mike Duff
08bd755af0
Issue #2636 - Change how retrieval plan is updated over time.
...
Peer review comments
Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950
Former-commit-id: c125b9d04433f81d882289bd047283c125b9d04433f81d882289bd047283911789b91089bd047283911789b910cddd263edc42e6591bc85f9d913c6dd277c1caf12467a11a7e
2014-02-18 12:05:26 -06:00
Brad Gonzales
e906d71ac4
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: 1d57e9f5f7379c0fb46c19460ed0d71d57e9f5f7379c0fb46c19460ed0d7ba4e30832819460ed0d7ba4e308328ae35320dd61b764881113be33809449aa1cb299eb0421675ff
2014-02-18 11:10:44 -06:00
Ron Anderson
c3b687b9a5
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: 410f956cffe7f2b6883d32bcf9d0d0410f956cffe7f2b6883d32bcf9d0d014a082a4e932bcf9d0d014a082a4e98779564e3a0135771eecd4ba9eba9468e03bf02f8a7af092f2
2014-02-18 10:45:20 -06:00
