xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6095 commits 31 branches 40 tags 3.8 GiB
Commit graph

2830 commits

Author SHA1 Message Date
Richard Peter
a74bd68f72 Omaha #1458: Remove reference to cron.properties 
Change-Id: Ia77204b32b9bfcc56ae795d47cdce4ceea307b29

Former-commit-id: 63114b4f82 [formerly 86aea04167] [formerly 63114b4f82 [formerly 86aea04167] [formerly 0430619d7b [formerly f95bb3a43e5a445c0a43628a9ed5e11e23a6a9b2]]]
Former-commit-id: 0430619d7b
Former-commit-id: 328a48a33d [formerly 02c77af062]
Former-commit-id: 400aa47f46
 2014-05-08 12:58:49 -05:00
Ben Steffensmeier
a32bb9b996 Issue #3080 Fix NaN handling of SliceSample. 
Former-commit-id: 3a87fa24df [formerly 0308147ad4] [formerly 3a87fa24df [formerly 0308147ad4] [formerly 1b6bdeac86 [formerly 9974018df428c84528cf98e9f868740accbabf58]]]
Former-commit-id: 1b6bdeac86
Former-commit-id: 7beb6429d4 [formerly 80a819f65b]
Former-commit-id: c56d799865
 2014-05-08 11:49:04 -05:00
Nate Jensen
e3d66c87ec Merge "Issue #2726: Fix GeospatialDataGenerator NPE" into omaha_14.3.1 
Former-commit-id: 3fdd5dbdd6 [formerly 8f8ac40c44] [formerly 3fdd5dbdd6 [formerly 8f8ac40c44] [formerly d4fef60be1 [formerly 34d2d296f304cd84a8105993803ca35c484c6b6e]]]
Former-commit-id: d4fef60be1
Former-commit-id: a50afc30eb [formerly 04e906f1a6]
Former-commit-id: 677e1662d7
 2014-05-08 10:19:43 -05:00
Richard Peter
f5e8f07e8b Issue #2726: Fix GeospatialDataGenerator NPE 
Change-Id: I07213e17fcbbadea9a33471c390bb07472ba31e0

Former-commit-id: 5a7c78c009 [formerly 24539708f9] [formerly 5a7c78c009 [formerly 24539708f9] [formerly 4d99d25a55 [formerly fdc542df454887a48f4a55ef6ea9594ff98b3345]]]
Former-commit-id: 4d99d25a55
Former-commit-id: 3c21c1042f [formerly 29a8db5216]
Former-commit-id: 601f151a8b
 2014-05-08 10:14:30 -05:00
Steve Harris
77030c2fc3 Omaha #3085 - re-deleted stuff that was re-added in a variety of ways. 
Former-commit-id: a804a071c0 [formerly ce2b030743] [formerly a804a071c0 [formerly ce2b030743] [formerly ff4a6b8122 [formerly 241ca845ebcce8426bf61d730baa5e97a7762381]]]
Former-commit-id: ff4a6b8122
Former-commit-id: 532b861bce [formerly 988ad59a0d]
Former-commit-id: 47991060bb
 2014-05-08 09:50:34 -05:00
Richard Peter
8c41358d2c Omaha #1458: Break-out cron.properties. 
Change-Id: I8d0cdafe812c42158ce38cdb3903737693b6f528

Former-commit-id: ad3f6c4af3 [formerly 6469ae94ed] [formerly ad3f6c4af3 [formerly 6469ae94ed] [formerly 348bc25760 [formerly 5954c321f38ba64d305c15270b12289fb34ccdff]]]
Former-commit-id: 348bc25760
Former-commit-id: c9d8bfdd06 [formerly 95488f49b1]
Former-commit-id: 284e1b762d
 2014-05-08 09:18:49 -05:00
Richard Peter
28d5614351 Omaha #2782: Update thread based logging 
Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8

Former-commit-id: 242716fb0f [formerly d5ec01f7c0] [formerly 242716fb0f [formerly d5ec01f7c0] [formerly adff7b5684 [formerly fe464020d287bbf21b7bc04402d31c97114c195b]]]
Former-commit-id: adff7b5684
Former-commit-id: 741710881f [formerly 7a7b65860b]
Former-commit-id: 401a880686
 2014-05-08 09:06:31 -05:00
Steve Harris
2b29fec8d6 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIFieldConverter.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml

Former-commit-id: ddd6e35478 [formerly e37e40ed19] [formerly ddd6e35478 [formerly e37e40ed19] [formerly b7a1bda98c [formerly 396a7cbfefed07cd25e4f8b1f028c566a06e4065]]]
Former-commit-id: b7a1bda98c
Former-commit-id: 7a7c1167c2 [formerly 9591532ffd]
Former-commit-id: 049716e54d
 2014-05-07 16:01:53 -05:00
Nate Jensen
4f18fe5173 Issue #2060 fix grid updates and performance 
Change-Id: I0937d7360e456f08fb613be547f7b488ebe05b50

Former-commit-id: c71edb2d4c [formerly e39378e5f0] [formerly c71edb2d4c [formerly e39378e5f0] [formerly acfbce58d1 [formerly a430e85f283b3e41b8520d241f675eff3c6c32e3]]]
Former-commit-id: acfbce58d1
Former-commit-id: 81b914ad9f [formerly 5099fd6463]
Former-commit-id: f4bb539ae8
 2014-05-07 15:30:13 -05:00
Dave Hladky
24a1a5a0c6 Issue #2940 More filenames printed, null from bad rec. 
Former-commit-id: cd4921b35f [formerly a2ef100bfc] [formerly cd4921b35f [formerly a2ef100bfc] [formerly dadc604ab3 [formerly 26bfd426965d208f92bcb1fcd650b5f2299724a4]]]
Former-commit-id: dadc604ab3
Former-commit-id: e58fa39adc [formerly f54cbb83a1]
Former-commit-id: 07c49a82b5
 2014-05-07 14:51:38 -05:00
Everett Kladstrup
dffec9a07f Omaha #3133 Remove some unecessary dependencies 
* Remove viz.core dependency from uf.common.ohd
* Remove org.osgi.framework dependency from uf.edex.ndm
* Remove non-existant activator from uf.edex.ndm manifest


Former-commit-id: 516a50a6a1 [formerly 3a00185e3c] [formerly 516a50a6a1 [formerly 3a00185e3c] [formerly b4a76a575a [formerly ce1379d30d26f96959dc07d8a7f3a1fc3d355c99]]]
Former-commit-id: b4a76a575a
Former-commit-id: a1070cc1ac [formerly ce743b3c43]
Former-commit-id: 279be89f4b
 2014-05-07 12:54:37 -05:00
Nate Jensen
6a620ffc04 Issue #2060 log successful sat precip file creation 
Change-Id: I40df627645e0c0e089609f8dcc56b8351a4c56f1

Former-commit-id: 3c1f9693f2 [formerly f06c77f5ad] [formerly 3c1f9693f2 [formerly f06c77f5ad] [formerly 170106ad44 [formerly b3158ae940ab59a7a96b4650f0f956c82b0c9d49]]]
Former-commit-id: 170106ad44
Former-commit-id: 40b5e501a2 [formerly af426cf278]
Former-commit-id: 505b45ff22
 2014-05-07 09:44:20 -05:00
Steve Harris
ab4d7cc569 Merge branch 'master_14.2.1' (14.2.1-23) into omaha_14.2.1 
Former-commit-id: a7211a72f0 [formerly c3509757f0] [formerly a7211a72f0 [formerly c3509757f0] [formerly 0392577b6c [formerly 575adeb94784b32ac0d89e3c4dd506c2fe500266]]]
Former-commit-id: 0392577b6c
Former-commit-id: 8c5eb7774e [formerly 6694af2d5e]
Former-commit-id: 7819c2878f
 2014-05-07 08:45:41 -05:00
Nate Jensen
cf09a6729c Issue #3101 fix some derived parameters on win64 platform 
Change-Id: I9de1d31e7f7c19af437aef834aa84f163bf36d86

Former-commit-id: 49d34cc4e4 [formerly 5191b61b30] [formerly 49d34cc4e4 [formerly 5191b61b30] [formerly aa7c1fac90 [formerly 4659c0240aa31b615bc50228906d514f47a72f94]]]
Former-commit-id: aa7c1fac90
Former-commit-id: 815aa21d8e [formerly 8c1748d370]
Former-commit-id: b708774e64
 2014-05-06 17:08:04 -05:00
Everett Kladstrup
99fd65216e Omaha #3112 Fix adding classes to WFS jaxb 
* Rebuild JAXBContext after adding additional classes
* Set output directory in build.properties to fix deploy location
* Remove unecessary dependencies from wfs manifest


Former-commit-id: 2ee2db6f38 [formerly 1184e77f1a] [formerly 2ee2db6f38 [formerly 1184e77f1a] [formerly aedb166b4d [formerly bd479bc83287f3c1bb9dd65176b9ea3f5b8901d1]]]
Former-commit-id: aedb166b4d
Former-commit-id: 5f378b30f0 [formerly 08e8a4a60a]
Former-commit-id: 8a4e0f8d71
 2014-05-06 17:07:23 -05:00
Ron Anderson
2616943080 Issue #3129 Change smartInit back to 1 thread on 64-bit 
Change-Id: Ie1e17e145d2d88485d91a29e4c74c737e4658038

Former-commit-id: 6c5f1a9ed3 [formerly b43e6d64c3] [formerly 6c5f1a9ed3 [formerly b43e6d64c3] [formerly 32c95e50a7 [formerly f2e15f4ab034f617a3a64814125dfee73b5070ac]]]
Former-commit-id: 32c95e50a7
Former-commit-id: 4a8b1296ea [formerly 85b86bd6e2]
Former-commit-id: cb6ed5a32c
 2014-05-06 16:01:31 -05:00
Richard Peter
fc1f958e5b Issue #2726: update smartInit threads to 1 
Change-Id: Ic2d432087f66fd9f03b3d6f01fefce8af0d5b0b0

Former-commit-id: 884562700a [formerly 03ab7599de] [formerly 884562700a [formerly 03ab7599de] [formerly 611c010968 [formerly c12469d133558750e85049f7ce0f0a42b802c2b9]]]
Former-commit-id: 611c010968
Former-commit-id: be288505e0 [formerly 4f2d470801]
Former-commit-id: a03997122b
 2014-05-06 15:54:23 -05:00
Ron Anderson
8d44fdcfb1 Issue #3118 Fix gridLocation issues with smartInit databases 
Change-Id: I4660418234a5c721381c7986b793d9339c81c603

Former-commit-id: 93320d43c9 [formerly b4815af7f8] [formerly 93320d43c9 [formerly b4815af7f8] [formerly ba0c26edf6 [formerly a4a5522abbb439066acfa3567d0036cf044ef9c7]]]
Former-commit-id: ba0c26edf6
Former-commit-id: 03ac05ef4c [formerly b694dbe2e1]
Former-commit-id: 98c11671d2
 2014-05-06 15:09:25 -05:00
Nate Jensen
17ddc5d8e5 Issue #2060 genericize DataURIFieldConverter 
Change-Id: I885b0a8ec64eb69256c04fa2476814b1300fcdd4

Former-commit-id: 7701820902 [formerly ff6c77420c] [formerly 7701820902 [formerly ff6c77420c] [formerly 87b6df4840 [formerly 0a7265da59457e8dc6a122db81b134d6555d5276]]]
Former-commit-id: 87b6df4840
Former-commit-id: d1a040b9c2 [formerly a6363fc3d4]
Former-commit-id: 5f08921768
 2014-05-06 13:10:48 -05:00
Nate Jensen
c8cc3b1b8e Merge "Issue #2060 fill in units on GridRecords created from URIs" into omaha_14.3.1 
Former-commit-id: d83fad0054 [formerly 0e3876de34] [formerly d83fad0054 [formerly 0e3876de34] [formerly 4f734ae7f9 [formerly c68f2924c4c7f998af859d7c88cd9d0049d636e5]]]
Former-commit-id: 4f734ae7f9
Former-commit-id: 732aaa6001 [formerly 044d086fc1]
Former-commit-id: 4db3b99181
 2014-05-06 13:09:12 -05:00
Nate Jensen
ad7a69f2e3 Issue #2060 fill in units on GridRecords created from URIs 
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a

Former-commit-id: 3719c41d2b [formerly 71b4227061] [formerly 3719c41d2b [formerly 71b4227061] [formerly 7cea97ab15 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]]
Former-commit-id: 7cea97ab15
Former-commit-id: 5bf1554597 [formerly 6bdbfb7e1a]
Former-commit-id: 66cd43313a
 2014-05-06 12:26:21 -05:00
Brian Clements
3c9f5ff37b Omaha #3116 changed log formatter class to match camel 2.12.3 
Former-commit-id: 170ce2c157 [formerly c77ba25dc8] [formerly 170ce2c157 [formerly c77ba25dc8] [formerly 51eb6c9f06 [formerly a63f569de8d9e8c924de9a9d9ca101e3e04e567d]]]
Former-commit-id: 51eb6c9f06
Former-commit-id: 5b26766041 [formerly b8a648f543]
Former-commit-id: ffc02d68d6
 2014-05-06 11:38:38 -05:00
Brian.Dyke
4f425f71e6 Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1 
Former-commit-id: 5461f75e41 [formerly 238e8f7ba1] [formerly 5461f75e41 [formerly 238e8f7ba1] [formerly e3b0b44b71 [formerly c6ba49e1206ed113b57a9fa39f5720ee9b3b979a]]]
Former-commit-id: e3b0b44b71
Former-commit-id: 430543e848 [formerly 43cc1d0b91]
Former-commit-id: fe9aeb1961
 2014-05-06 11:34:46 -04:00
Chip Gobs
47068a7939 VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) ) 
Change-Id: Id96c25de545144d769309fef608c431d67d1bada

Former-commit-id: 4e4d00792d [formerly 65d2135ac2] [formerly 4e4d00792d [formerly 65d2135ac2] [formerly e42bef2a33 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]]]
Former-commit-id: e42bef2a33
Former-commit-id: c075175e8e [formerly 593b36d722]
Former-commit-id: 1b7f762617
 2014-05-06 10:48:35 -04:00
Richard Peter
4f6a9a0562 Issue #2726: Autoset route startup order. 
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc

Former-commit-id: 8ae9cfba55 [formerly b148d11ec9] [formerly 8ae9cfba55 [formerly b148d11ec9] [formerly 4dc91f494f [formerly 9b9d2b475f4777febf125e4013cba0d971eaf8e8]]]
Former-commit-id: 4dc91f494f
Former-commit-id: 7fe7b43ee2 [formerly c6719da76b]
Former-commit-id: 4a140afac6
 2014-05-06 09:46:41 -05:00
Steve Harris
b8b5300a9b Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts (updated in ufcore):
	cave/com.raytheon.uf.viz.application.feature/feature.xml
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/src/com/raytheon/uf/common/derivparam/python/MasterDerivScript.java
	edexOsgi/com.raytheon.uf.common.time/utility/common_static/base/python/time/DataTime.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/SessionManagedDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java


Former-commit-id: a8d3f4d885 [formerly 73ed3251bd] [formerly a8d3f4d885 [formerly 73ed3251bd] [formerly 83368e4b4e [formerly e26c8f0a5c62444d7ada1cfa7a15cb463a4b5285]]]
Former-commit-id: 83368e4b4e
Former-commit-id: ea24d1dadc [formerly caadbd3dd9]
Former-commit-id: 8cd5ed7a8e
 2014-05-05 16:04:09 -05:00
Melissa Porricel
9b7d84bfc4 ASM #481 - Add Guam GFSDNG to AWIPS 
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca

Former-commit-id: a91a4ed137 [formerly 42c36a5e80] [formerly a91a4ed137 [formerly 42c36a5e80] [formerly 92231e051d [formerly 012fa438f085498027402c1cd0897dd13c0d4edc]]]
Former-commit-id: 92231e051d
Former-commit-id: 6749967b5b [formerly 1e32d583b4]
Former-commit-id: 38539cc805
 2014-05-05 14:56:58 -04:00
Nate Jensen
d50f19d715 Issue #2060 fix sat precip for grid data URI removal 
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58

Former-commit-id: 2b6c30e67d [formerly 0cf0f724f4] [formerly 2b6c30e67d [formerly 0cf0f724f4] [formerly d82f6e5ff6 [formerly cf0bb31583f0ec0b2135aa9101f3247e88e877d0]]]
Former-commit-id: d82f6e5ff6
Former-commit-id: 09091ccf25 [formerly 97597c3ab1]
Former-commit-id: 0840a62eb8
 2014-05-05 13:06:08 -05:00
Dave Hladky
7e763a5a22 Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java

Former-commit-id: 0ac4de6ad0 [formerly 333bf8b36d] [formerly 0ac4de6ad0 [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: 93ca9cfe6a [formerly 7611339cd8]
Former-commit-id: cb94f9fc97
 2014-05-05 12:15:14 -05:00
Steve Harris
4fe84ba0fd Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22) 
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
	edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml

Former-commit-id: 9e149df799 [formerly 6ef3b9f1e5] [formerly 9e149df799 [formerly 6ef3b9f1e5] [formerly 1c8f2f6185 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 927a87b126 [formerly b797b4b1fa]
Former-commit-id: 17318b1870
 2014-05-05 08:21:02 -05:00
Xuezhi.Wei
02e31e37f6 ASM #579 Shef Ingest ProcessUtil configuration update 
Change-Id: Idc121a2b4b303e53ac2f9a7fc0dc2cb045b08150

Former-commit-id: b017e1c390 [formerly fb359316c8] [formerly b017e1c390 [formerly fb359316c8] [formerly e3b1ee759d [formerly ddda775e85dd8cba5f4342de330d1446647c621c]]]
Former-commit-id: e3b1ee759d
Former-commit-id: 4fcbc99209 [formerly 454b3acb5c]
Former-commit-id: 627a1aa6d8
 2014-05-02 19:48:55 +00:00
Brad Gonzales
8aca12b211 Omaha #3106 Updated deploy and install ant scripts to handle the 14.4.1 repository structure. 
Change-Id: I7de7600fbcc6bb6ebc9392aef291babc086f3115

Former-commit-id: cbcd7dcc3e [formerly df353f06f5] [formerly cbcd7dcc3e [formerly df353f06f5] [formerly 39a2ec8f46 [formerly 9372afbd268a61e63b2c9ba2b25529e654cfee6e]]]
Former-commit-id: 39a2ec8f46
Former-commit-id: b33bd153f4 [formerly 78714c6ff7]
Former-commit-id: 91caaba15c
 2014-05-02 13:09:57 -05:00
Shawn.Hooper
66e0a8cb74 ASM #131 - Additional fix for Lightning Data Decoder 
Change-Id: I014a5ce61e495c2339f17ef22f706a3ad1a1ee72

Former-commit-id: faa9f20f84 [formerly 76d4a7ac73] [formerly faa9f20f84 [formerly 76d4a7ac73] [formerly d80a278cb7 [formerly 4bada72eef85bf38522b40526643ebd8bddc9005]]]
Former-commit-id: d80a278cb7
Former-commit-id: 98631b46c8 [formerly b5b0c01eb9]
Former-commit-id: a58a5e95da
 2014-05-02 12:48:18 -04:00
Richard Peter
9326b9d125 Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1 
Former-commit-id: f38816d168 [formerly dc0b598fd4] [formerly f38816d168 [formerly dc0b598fd4] [formerly 132d63ac44 [formerly 28b33188773001c34946464093319dc2a1117be9]]]
Former-commit-id: 132d63ac44
Former-commit-id: 8e141a137a [formerly 5314b412b4]
Former-commit-id: b9351199b8
 2014-05-02 10:05:59 -05:00
Ben Steffensmeier
dd315aa9b8 Issue #3095 Update JGridData for creation of numeric java package. 
Former-commit-id: 956f62a6ec [formerly 6bdaba048c] [formerly 956f62a6ec [formerly 6bdaba048c] [formerly 23d6da4a18 [formerly a3081bf46908788e78c707bf51e08f6c98d997bc]]]
Former-commit-id: 23d6da4a18
Former-commit-id: d2c0499f2c [formerly 3300d8c75c]
Former-commit-id: c2a3dbe9af
 2014-05-01 18:02:08 -05:00
brian.dyke
22ffaef982 Merge branch 'master_14.3.1-3' into asm_14.3.1 
Former-commit-id: 2a934def82 [formerly 5d7b8eca6a] [formerly 2a934def82 [formerly 5d7b8eca6a] [formerly d5c3f112c1 [formerly c31c7837568ec4a8fd1516a9e9cd115df30cee40]]]
Former-commit-id: d5c3f112c1
Former-commit-id: b68c49053a [formerly 302366dac1]
Former-commit-id: b72e2d4289
 2014-05-01 15:20:36 -04:00
Steve Harris
523cf536e2 Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1 
Former-commit-id: 9ecd871825 [formerly c8ba70a146] [formerly 9ecd871825 [formerly c8ba70a146] [formerly 779e85cc77 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]
Former-commit-id: 779e85cc77
Former-commit-id: 9a6ab8c52f [formerly bdf6d0b6be]
Former-commit-id: d7c31fe4a9
 2014-05-01 13:25:15 -05:00
Steve Harris
56bf68d145 Omaha #3085 - re-deleted stuff that was re-added in the merge from omaha_14.3.1 to omaha_14.4.1 
Change-Id: Id13953881429545bccb590a550c23a73f77d585e

Former-commit-id: 11ca44c583 [formerly 70ee74a311] [formerly 11ca44c583 [formerly 70ee74a311] [formerly ab0b1ec047 [formerly 75d4816f97b0b6fa2bf93847038c4f15b3479e39]]]
Former-commit-id: ab0b1ec047
Former-commit-id: beba75f87c [formerly 579eb6e47a]
Former-commit-id: 64849d50ec
 2014-05-01 12:53:06 -05:00
Nate Jensen
7c748842f0 Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1 
Former-commit-id: ba9ed2aba3 [formerly b7536a398b] [formerly ba9ed2aba3 [formerly b7536a398b] [formerly 96071c250d [formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]]
Former-commit-id: 96071c250d
Former-commit-id: dbca36c2bc [formerly 4c2923246a]
Former-commit-id: 704eff96aa
 2014-05-01 12:40:41 -05:00
Brian Clements
36b2419ff1 Issue #2903 changed commons.lang to match other unpacking foss 
Former-commit-id: 93912625ea [formerly 3ca4f8cc52] [formerly 93912625ea [formerly 3ca4f8cc52] [formerly dd5412e119 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]
Former-commit-id: dd5412e119
Former-commit-id: 3fd504f1de [formerly 2337d5ef56]
Former-commit-id: c7cea4b5f7
 2014-05-01 12:34:09 -05:00
Bryan Kowal
10a57d5299 Issue #3099 - handle empty location name lists in the data request 
Former-commit-id: ff21ef813c [formerly 5eac78f0e0] [formerly ff21ef813c [formerly 5eac78f0e0] [formerly a9b9a8b8c4 [formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]]]
Former-commit-id: a9b9a8b8c4
Former-commit-id: 4775dc1f40 [formerly 2079aec2bb]
Former-commit-id: bf24af6980
 2014-05-01 12:12:42 -05:00
Nate Jensen
4669a93a96 Issue #3101 safe cast numpy shape values to Number 
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c

Former-commit-id: 7b2ed421f0 [formerly 2a0775e748] [formerly 7b2ed421f0 [formerly 2a0775e748] [formerly 76ad31501b [formerly 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb]]]
Former-commit-id: 76ad31501b
Former-commit-id: ffb294cab4 [formerly 191f6c3385]
Former-commit-id: ee285cfc57
 2014-05-01 11:01:37 -05:00
Brian Clements
4c1a6b44c8 Issue #2903 set commons.lang to unpack in feature to fix odd bug 
collaboration gets in a state where commons.lang is no longer found
setting unpack to true might help


Former-commit-id: fee0a858cb [formerly 873efa1c64] [formerly fee0a858cb [formerly 873efa1c64] [formerly f45e435f2c [formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]
Former-commit-id: f45e435f2c
Former-commit-id: 20830253ba [formerly c187523782]
Former-commit-id: c3d2b4be86
 2014-04-30 17:52:43 -05:00
Richard Peter
cfb980db11 Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1 
Former-commit-id: d28c4fdbae [formerly de9eb60629] [formerly d28c4fdbae [formerly de9eb60629] [formerly 86ddd480c1 [formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]
Former-commit-id: 86ddd480c1
Former-commit-id: d961ff6edc [formerly 6ecb5018b6]
Former-commit-id: dd54408a10
 2014-04-30 17:43:50 -05:00
Dave Hladky
a06db5a4e7 Issue #2992 Updated DD list of active registries 
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: e2a4bb6755 [formerly c352643c79] [formerly e2a4bb6755 [formerly c352643c79] [formerly 3b00ae03cc [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: ea791b5ca5 [formerly bf42c8d740]
Former-commit-id: 5b11e45636
 2014-04-30 17:38:28 -05:00
Nate Jensen
bf92253e0f Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1 
Former-commit-id: f6f9169aef [formerly 1eade4f434] [formerly f6f9169aef [formerly 1eade4f434] [formerly f005d2f31c [formerly aebaae7802e5429eed3ebc39ae9be45568912d8a]]]
Former-commit-id: f005d2f31c
Former-commit-id: a6df4bd2b2 [formerly b98328113b]
Former-commit-id: 9b3282fabf
 2014-04-30 15:16:11 -05:00
Ben Steffensmeier
c92d5785c9 Issue #2946 Fix auxillary purge rules. 
Former-commit-id: bcc02476c6 [formerly 2850d80610] [formerly bcc02476c6 [formerly 2850d80610] [formerly 4c06cd6f5e [formerly a62bdff82f96e79737269686598687ecef746c01]]]
Former-commit-id: 4c06cd6f5e
Former-commit-id: 076165515a [formerly e51a0dcb13]
Former-commit-id: 749e7fa56d
 2014-04-30 14:38:27 -05:00
brian.dyke
e6d1e495c4 Merge branch 'master_14.2.1-22' into asm_14.2.1 
Former-commit-id: 3bf22884a4 [formerly d56fab37e7] [formerly 3bf22884a4 [formerly d56fab37e7] [formerly f3972ce929 [formerly 3666b29a33ca9c758fa87bd387ebd6ad49b97b2a]]]
Former-commit-id: f3972ce929
Former-commit-id: f83a3cda77 [formerly 5f6646adde]
Former-commit-id: 04ef888bac
 2014-04-30 14:21:11 -04:00
Nate Jensen
eb5dd811ca Issue #2060 fix FFG processing 
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0

Former-commit-id: 2d19ee46e5 [formerly 8cbea21f32] [formerly 2d19ee46e5 [formerly 8cbea21f32] [formerly 9b19f95d24 [formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 9a2c674142 [formerly a33ca4e3ac]
Former-commit-id: 58618a1842
 2014-04-30 13:08:26 -05:00
Brian.Dyke
f16c305ae4 Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2) 
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
	edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java

Former-commit-id: e56bd61ee6 [formerly 278aab6b6f] [formerly e56bd61ee6 [formerly 278aab6b6f] [formerly 63137ed69c [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]
Former-commit-id: 63137ed69c
Former-commit-id: fcf13ae9f7 [formerly 8160209e52]
Former-commit-id: 5d31c9ec9a
 2014-04-30 12:57:09 -04:00