Commit graph

2738 commits

Author SHA1 Message Date
Steve Harris
9ecd871825 Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: 779e85cc77 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]
Former-commit-id: c8ba70a146
2014-05-01 13:25:15 -05:00
Nate Jensen
ba9ed2aba3 Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
Former-commit-id: 96071c250d [formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]
Former-commit-id: b7536a398b
2014-05-01 12:40:41 -05:00
Brian Clements
93912625ea Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: dd5412e119 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]
Former-commit-id: 3ca4f8cc52
2014-05-01 12:34:09 -05:00
Bryan Kowal
ff21ef813c Issue #3099 - handle empty location name lists in the data request
Former-commit-id: a9b9a8b8c4 [formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]
Former-commit-id: 5eac78f0e0
2014-05-01 12:12:42 -05:00
Nate Jensen
7b2ed421f0 Issue #3101 safe cast numpy shape values to Number
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c

Former-commit-id: 76ad31501b [formerly 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb]
Former-commit-id: 2a0775e748
2014-05-01 11:01:37 -05:00
Brian Clements
fee0a858cb 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: f45e435f2c [formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]
Former-commit-id: 873efa1c64
2014-04-30 17:52:43 -05:00
Richard Peter
d28c4fdbae Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
Former-commit-id: 86ddd480c1 [formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]
Former-commit-id: de9eb60629
2014-04-30 17:43:50 -05:00
Dave Hladky
e2a4bb6755 Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: 3b00ae03cc [formerly a34955102d1316135c4151210daba0e5807ff6c9]
Former-commit-id: c352643c79
2014-04-30 17:38:28 -05:00
Nate Jensen
f6f9169aef Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1
Former-commit-id: f005d2f31c [formerly aebaae7802e5429eed3ebc39ae9be45568912d8a]
Former-commit-id: 1eade4f434
2014-04-30 15:16:11 -05:00
Ben Steffensmeier
bcc02476c6 Issue #2946 Fix auxillary purge rules.
Former-commit-id: 4c06cd6f5e [formerly a62bdff82f96e79737269686598687ecef746c01]
Former-commit-id: 2850d80610
2014-04-30 14:38:27 -05:00
brian.dyke
3bf22884a4 Merge branch 'master_14.2.1-22' into asm_14.2.1
Former-commit-id: f3972ce929 [formerly 3666b29a33ca9c758fa87bd387ebd6ad49b97b2a]
Former-commit-id: d56fab37e7
2014-04-30 14:21:11 -04:00
Nate Jensen
2d19ee46e5 Issue #2060 fix FFG processing
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0

Former-commit-id: 9b19f95d24 [formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]
Former-commit-id: 8cbea21f32
2014-04-30 13:08:26 -05:00
Brian.Dyke
e56bd61ee6 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: 63137ed69c [formerly 64c3766ed570885a796f846b889d40413e8250c6]
Former-commit-id: 278aab6b6f
2014-04-30 12:57:09 -04:00
Mike Duff
90895cf316 Issue #2860 - Fix to not create empty substitution tags
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff

Former-commit-id: c0b2a19a2f [formerly ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1]
Former-commit-id: 60bfadd865
2014-04-30 10:17:56 -05:00
Richard Peter
74b2cdfe34 Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1
Former-commit-id: 9dafb3b9e3 [formerly 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0]
Former-commit-id: 4ae87dcece
2014-04-29 16:14:52 -05:00
Ben Steffensmeier
fe5d69c896 Issue #3081 Use alias in derived paraemters less.
Former-commit-id: 60a7f64a5e [formerly cdbfab27991a9536e48436c084801eb507322e7c]
Former-commit-id: 1d38fb2df1
2014-04-29 15:43:08 -05:00
Ben Steffensmeier
eb9a0398df Issue #3080 add NaN conversion to Slice.py
Former-commit-id: 5959b17732 [formerly 084a209f64cf9deb527414500c368ea397b9e3a4]
Former-commit-id: 156c25fb9c
2014-04-29 15:35:29 -05:00
Roger Ferrel
039e4b5209 Issue #3036 Added check for archive's root directories.
Former-commit-id: 3259d4d44d [formerly f344acf3572150c7470ab1e3c3bbb356166c78ff]
Former-commit-id: 7a2775ecbc
2014-04-29 14:15:11 -05:00
Brian Clements
abb14c67e7 Issue #2906 added close to BUFR parser
close netcdf file to solve NFS clean issue


Former-commit-id: a1e416da97 [formerly 9675e997369e39455aacadcd72d0d8476f6c7ffc]
Former-commit-id: 5beb3be2e8
2014-04-29 13:48:00 -05:00
Brian.Dyke
c5e29cc46a Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)


Former-commit-id: bdda2e9a7a [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]
Former-commit-id: 35b637c3e2
2014-04-29 12:07:21 -04:00
Richard Peter
67683dd891 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]
Former-commit-id: 44b1782461
2014-04-28 16:27:40 -05:00
Ben Steffensmeier
3601d1ff98 Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries.
Former-commit-id: 9985f518b1 [formerly b75445ffea12040487d57bdf248ff3fd48877d8d]
Former-commit-id: 25e4eee58a
2014-04-28 16:26:04 -05:00
brian.dyke
ddfc734c26 Merge branch 'master_14.2.1' into asm_14.2.1
Merge (master_14.2.1-21) into asm_14.2.1


Former-commit-id: cbe7b3ec72 [formerly 2cd6c57e232b4f4a2a24c54d74e7ce9f08351b79]
Former-commit-id: 6cc1c166f9
2014-04-28 14:06:15 -04:00
brian.dyke
ffad42f2ef Merge branch 'master_14.3.1' into asm_14.3.1
Merge 14.3.1-2 into ASM


Former-commit-id: 4621d66089 [formerly 29bcb6987ee371f128b75eee84b65574d799135f]
Former-commit-id: 8bda882ed0
2014-04-28 13:25:41 -04:00
Dave Hladky
dc3b99cbf4 Issue #2940 Better error message for bad XMRG config in FFMP
Former-commit-id: 82be445e97 [formerly dfa3f534b96852975afcd13a6bed653b0f3b8f40]
Former-commit-id: 2f4c0cd364
2014-04-28 11:04:35 -05:00
Loubna.Bousaidi
0cf63a9711 ASM #578 apply gross range check to the adjusted value
Change-Id: Ia90bc10e6e1e1baa8f3842ade56d7551ca405e34

Former-commit-id: 26daea0e30 [formerly 598700ad6ca6cb7881d68f8e7703327f7c58c19c]
Former-commit-id: 9585fc8077
2014-04-28 14:16:50 +00:00
Richard Peter
5a0083987b Merge "Issue #3000 fix common.dataplugin.bufrmos manifest" into development
Former-commit-id: b06172a798 [formerly d338c2ad7562c6c86915c9e95d2aeca35d401586]
Former-commit-id: 98b35d30c0
2014-04-25 14:57:51 -05:00
Nate Jensen
d425f134ae Merge "Issue #2629: Update capture to grab Xorg log files." into development
Former-commit-id: 9a46583271 [formerly 4dc1938de1bd30ac5223a1c0a6748139454ddc2e]
Former-commit-id: 4842f08165
2014-04-25 14:57:47 -05:00
Richard Peter
1781500740 Issue #2726: Make SmartInit shutdown more gracefully
Change-Id: I1a5514e75645083a1d8fa8a771ac33ea8fd39fe7

Former-commit-id: 6918dc0026 [formerly 93f8af097d2a04e054e1c3d0ae0b7d62ca30892e]
Former-commit-id: 36742a30f3
2014-04-25 14:53:22 -05:00
Nate Jensen
3719815807 Issue #3000 fix common.dataplugin.bufrmos manifest
Change-Id: I4f414ad2cc3d147badb0196a03ba152c9a74dccf

Former-commit-id: ca2cc7f11d [formerly c91c2477aeff207ff253bce22b4fea57a7172d5c]
Former-commit-id: deda54488f
2014-04-25 14:51:45 -05:00
Richard Peter
5fb2aef966 Issue #2629: Update capture to grab Xorg log files.
Change-Id: Ic6d4806bee75894805fb7fa5882d3b454418c26d

Former-commit-id: 1cc7977b99 [formerly 38ad09697f3e618b6c9edb6592913b2d50014d14]
Former-commit-id: de249decab
2014-04-25 14:42:53 -05:00
Ben Steffensmeier
9478f8adc9 Issue #2874 Allow RTOFS nowcast to be identified by process type.
Former-commit-id: fa3d4bb618 [formerly 1e430dd1227f2e368a7da21d116677a3b522d5ed]
Former-commit-id: 2d96d9d2df
2014-04-25 14:38:36 -05:00
Nate Jensen
64a09dbdc6 Merge "Issue #2060 remove FFG post processor dependency on dataURI, other minor cleanups" into development
Former-commit-id: 0a245df4f1 [formerly 5b4555f7e94bf952b6e2323685e53e4708a8039b]
Former-commit-id: cf6992073f
2014-04-25 13:26:10 -05:00
Richard Peter
86d1ff9427 Issue #2995: Update DB Class Finder to search all plugin jars
Change-Id: I42b5207372aa9d6f07afff0d18819c60b85fb3f8

Former-commit-id: 5c0f9b5ba5 [formerly f3fe2db624f7f9e6c7b0b65d600ddba5e42de361]
Former-commit-id: 44701f31f2
2014-04-25 13:07:59 -05:00
Nate Jensen
d9ad750a99 Issue #2060 remove FFG post processor dependency on dataURI, other minor
cleanups

Change-Id: I4c572c3f7d2bef1bdd0b9a596f916e29f8e53410

Former-commit-id: 74b3181107 [formerly b45cdd1a3f4742937b9085ca70d538ae724d6aab]
Former-commit-id: 7da49c00f5
2014-04-25 12:19:23 -05:00
David Gillingham
c14497b1b7 Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb

Former-commit-id: 6ca193b8e9 [formerly 33197dc6708b65e85233b51be1e99e6411ece60f]
Former-commit-id: 2426e463f7
2014-04-25 10:56:43 -05:00
Brian.Dyke
f0b8ea5822 Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]
Former-commit-id: fb1f5aa593
2014-04-25 11:06:11 -04:00
Shawn.Hooper
8ffe88d856 ASM #224 - WarnGen: OB13.5.2 Template Errors
Change-Id: I99339c0ea3d0110ca855dd3db82b41b28a32dd6d

Former-commit-id: 79db962a88 [formerly c6fffaf265dc184b7692a43bb461572f54b8190a]
Former-commit-id: 09204a381c
2014-04-25 10:19:48 -04:00
Steve Harris
066515b7c5 Merge branch 'master_14.2.1' (14.2.1-19,20) into omaha_14.2.1
Change-Id: Ib48a2c15e266cd012aba975c25ef094b828a0f68

Former-commit-id: 18e79fe08d [formerly 749922901de5a57c7344f29def844a5ecf90304a]
Former-commit-id: 4f9620bb04
2014-04-25 09:09:38 -05:00
Richard Peter
5b3ffb51b0 Merge "Issue #2726: Add hooks to stop archiving processes during shutdown." into development
Former-commit-id: 225d95171c [formerly 98e0a18741b559dff887db980d95965edf5f7cae]
Former-commit-id: 0b765efce0
2014-04-24 19:15:56 -05:00
Richard Peter
5b14b22ee1 Issue #2726: Add hooks to stop archiving processes during shutdown.
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a

Former-commit-id: 9a7e1aa9b0 [formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]
Former-commit-id: 37342cba87
2014-04-24 19:11:50 -05:00
Nate Jensen
2a86a2652d Merge "Issue #2060 remove dependency on grid dataURI column from more of DAT" into development
Former-commit-id: 9cea7f88fb [formerly c73204189b318fd3aed128535166f72c99739dba]
Former-commit-id: 9ea03a1b3b
2014-04-24 18:20:27 -05:00
Lee Venable
15c9311c97 Merge "Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs." into development
Former-commit-id: e7acb04432 [formerly 9762326cea40526042cd7f371d864a96abd63842]
Former-commit-id: a511f8d4e7
2014-04-24 17:53:05 -05:00
Nate Jensen
91df50ded7 Issue #2060 remove dependency on grid dataURI column from more of DAT
Change-Id: I9123d2508f359e65124f90dafdfdf5efeaf1241a

Former-commit-id: e1eaca8071 [formerly e7963b0bcea141f33a00c264b26ae264d00f3abf]
Former-commit-id: 6cbd35aa47
2014-04-24 15:04:54 -05:00
Slav Korolev
150a132320 Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs.
Former-commit-id: f458f75ecf [formerly 879a50a60209abf95752c178a0266cdd42bde012]
Former-commit-id: 689930c484
2014-04-24 15:40:52 -04:00
Brian.Dyke
a5c9321a8d Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: ac74878ae2 [formerly 48184880ce65a4899a4ed989f2d3f8082771047f]
Former-commit-id: a61af3e6d3
2014-04-24 13:28:31 -04:00
Brian.Dyke
eff27f5504 Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: e82fc8f89c [formerly 4e921dbeab89e61635144b441ae0015155376c59]
Former-commit-id: a19f01c620
2014-04-24 13:01:50 -04:00
David Gillingham
6186e67e5c Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data.
Change-Id: I750323b3330016a98eef9778e8491ac920ea77ec

Former-commit-id: 16adfb2573 [formerly 0b91ae192358aa162833fb332ba4e551878199f9]
Former-commit-id: eea20ba3ef
2014-04-24 11:11:06 -05:00
Richard Peter
ad824c25ab Merge "Issue #2928: Update DD WebContainer to allow loading properties from environment" into development
Former-commit-id: 2b379eaedc [formerly 560113a526caf0572dfcf6e0c4792a071f49f81c]
Former-commit-id: b99353b37d
2014-04-23 17:31:31 -05:00
Ron Anderson
7c3d99cf91 Issue #2971 Fix regex in warning.xml
Change-Id: I74998354d07596551763a0453973ea4a6ea6f806

Former-commit-id: b1d43ae61a [formerly 60c4d87b387b3902fb0feacbf48807490b17e90c]
Former-commit-id: 27d5639b58
2014-04-23 17:24:41 -05:00