Commit graph

2738 commits

Author SHA1 Message Date
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
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
Mike Duff
ac6147c463 Issue #2860 - Fix to not create empty substitution tags
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff

Former-commit-id: 90895cf316 [formerly 60bfadd865] [formerly 90895cf316 [formerly 60bfadd865] [formerly c0b2a19a2f [formerly ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1]]]
Former-commit-id: c0b2a19a2f
Former-commit-id: 1e84cb07c2 [formerly 0601068b03]
Former-commit-id: 927e8ffcbb
2014-04-30 10:17:56 -05:00
Richard Peter
6668196c3d Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1
Former-commit-id: 74b2cdfe34 [formerly 4ae87dcece] [formerly 74b2cdfe34 [formerly 4ae87dcece] [formerly 9dafb3b9e3 [formerly 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0]]]
Former-commit-id: 9dafb3b9e3
Former-commit-id: f381290ed1 [formerly 9663a83d1f]
Former-commit-id: 1488bb27f8
2014-04-29 16:14:52 -05:00
Ben Steffensmeier
b2c93dda87 Issue #3081 Use alias in derived paraemters less.
Former-commit-id: fe5d69c896 [formerly 1d38fb2df1] [formerly fe5d69c896 [formerly 1d38fb2df1] [formerly 60a7f64a5e [formerly cdbfab27991a9536e48436c084801eb507322e7c]]]
Former-commit-id: 60a7f64a5e
Former-commit-id: f31d7f826b [formerly 539a32666b]
Former-commit-id: d4d1e28775
2014-04-29 15:43:08 -05:00
Ben Steffensmeier
af80e94349 Issue #3080 add NaN conversion to Slice.py
Former-commit-id: eb9a0398df [formerly 156c25fb9c] [formerly eb9a0398df [formerly 156c25fb9c] [formerly 5959b17732 [formerly 084a209f64cf9deb527414500c368ea397b9e3a4]]]
Former-commit-id: 5959b17732
Former-commit-id: 8a1b16d15e [formerly ca8cd9fb43]
Former-commit-id: 3be0087fb9
2014-04-29 15:35:29 -05:00
Roger Ferrel
6751691433 Issue #3036 Added check for archive's root directories.
Former-commit-id: 039e4b5209 [formerly 7a2775ecbc] [formerly 039e4b5209 [formerly 7a2775ecbc] [formerly 3259d4d44d [formerly f344acf3572150c7470ab1e3c3bbb356166c78ff]]]
Former-commit-id: 3259d4d44d
Former-commit-id: 39f7eb1ecc [formerly f71aee1e36]
Former-commit-id: d9015cddb4
2014-04-29 14:15:11 -05:00
Brian Clements
3c8a573a48 Issue #2906 added close to BUFR parser
close netcdf file to solve NFS clean issue


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


Former-commit-id: c5e29cc46a [formerly 35b637c3e2] [formerly c5e29cc46a [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: f8c3dca497 [formerly 59f34e3108]
Former-commit-id: 85bf52ef22
2014-04-29 12:07:21 -04:00
Richard Peter
938e39a0fc 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: 67683dd891 [formerly 44b1782461] [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 6966b79246 [formerly 80d4153878]
Former-commit-id: 24a3fe1466
2014-04-28 16:27:40 -05:00
Ben Steffensmeier
bd1978f79f Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries.
Former-commit-id: 3601d1ff98 [formerly 25e4eee58a] [formerly 3601d1ff98 [formerly 25e4eee58a] [formerly 9985f518b1 [formerly b75445ffea12040487d57bdf248ff3fd48877d8d]]]
Former-commit-id: 9985f518b1
Former-commit-id: 67bc21c089 [formerly bd966b1fa5]
Former-commit-id: 416a504a05
2014-04-28 16:26:04 -05:00
brian.dyke
72895ea055 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: ddfc734c26 [formerly 6cc1c166f9] [formerly ddfc734c26 [formerly 6cc1c166f9] [formerly cbe7b3ec72 [formerly 2cd6c57e232b4f4a2a24c54d74e7ce9f08351b79]]]
Former-commit-id: cbe7b3ec72
Former-commit-id: 40615bd734 [formerly 149058069f]
Former-commit-id: 3df3d28a8b
2014-04-28 14:06:15 -04:00
brian.dyke
864e83994e Merge branch 'master_14.3.1' into asm_14.3.1
Merge 14.3.1-2 into ASM


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

Former-commit-id: 0cf63a9711 [formerly 9585fc8077] [formerly 0cf63a9711 [formerly 9585fc8077] [formerly 26daea0e30 [formerly 598700ad6ca6cb7881d68f8e7703327f7c58c19c]]]
Former-commit-id: 26daea0e30
Former-commit-id: 2d2493dc93 [formerly 39b11467cf]
Former-commit-id: 896be043c8
2014-04-28 14:16:50 +00:00
Richard Peter
4ac0d62d7c Merge "Issue #3000 fix common.dataplugin.bufrmos manifest" into development
Former-commit-id: 5a0083987b [formerly 98b35d30c0] [formerly 5a0083987b [formerly 98b35d30c0] [formerly b06172a798 [formerly d338c2ad7562c6c86915c9e95d2aeca35d401586]]]
Former-commit-id: b06172a798
Former-commit-id: c7882721b2 [formerly f5f6ff0008]
Former-commit-id: bac20bb9dd
2014-04-25 14:57:51 -05:00
Nate Jensen
8f87fdc431 Merge "Issue #2629: Update capture to grab Xorg log files." into development
Former-commit-id: d425f134ae [formerly 4842f08165] [formerly d425f134ae [formerly 4842f08165] [formerly 9a46583271 [formerly 4dc1938de1bd30ac5223a1c0a6748139454ddc2e]]]
Former-commit-id: 9a46583271
Former-commit-id: 1d6014f363 [formerly acfc3c2b20]
Former-commit-id: ac0b4dc1f2
2014-04-25 14:57:47 -05:00
Richard Peter
6775b0dce6 Issue #2726: Make SmartInit shutdown more gracefully
Change-Id: I1a5514e75645083a1d8fa8a771ac33ea8fd39fe7

Former-commit-id: 1781500740 [formerly 36742a30f3] [formerly 1781500740 [formerly 36742a30f3] [formerly 6918dc0026 [formerly 93f8af097d2a04e054e1c3d0ae0b7d62ca30892e]]]
Former-commit-id: 6918dc0026
Former-commit-id: 433d5a77f6 [formerly 52e821b5bb]
Former-commit-id: 5a49b7e345
2014-04-25 14:53:22 -05:00
Nate Jensen
3c4a864333 Issue #3000 fix common.dataplugin.bufrmos manifest
Change-Id: I4f414ad2cc3d147badb0196a03ba152c9a74dccf

Former-commit-id: 3719815807 [formerly deda54488f] [formerly 3719815807 [formerly deda54488f] [formerly ca2cc7f11d [formerly c91c2477aeff207ff253bce22b4fea57a7172d5c]]]
Former-commit-id: ca2cc7f11d
Former-commit-id: 4b24593f10 [formerly 619af04a23]
Former-commit-id: 83864b0ff0
2014-04-25 14:51:45 -05:00
Richard Peter
3cbb7cb196 Issue #2629: Update capture to grab Xorg log files.
Change-Id: Ic6d4806bee75894805fb7fa5882d3b454418c26d

Former-commit-id: 5fb2aef966 [formerly de249decab] [formerly 5fb2aef966 [formerly de249decab] [formerly 1cc7977b99 [formerly 38ad09697f3e618b6c9edb6592913b2d50014d14]]]
Former-commit-id: 1cc7977b99
Former-commit-id: 3f66895529 [formerly 7e3d3f3093]
Former-commit-id: 92c2f7fa50
2014-04-25 14:42:53 -05:00
Ben Steffensmeier
1bb8ce2cbe Issue #2874 Allow RTOFS nowcast to be identified by process type.
Former-commit-id: 9478f8adc9 [formerly 2d96d9d2df] [formerly 9478f8adc9 [formerly 2d96d9d2df] [formerly fa3d4bb618 [formerly 1e430dd1227f2e368a7da21d116677a3b522d5ed]]]
Former-commit-id: fa3d4bb618
Former-commit-id: 080c2a48f3 [formerly 7499987f52]
Former-commit-id: 86174019b5
2014-04-25 14:38:36 -05:00
Nate Jensen
e0f4544f94 Merge "Issue #2060 remove FFG post processor dependency on dataURI, other minor cleanups" into development
Former-commit-id: 64a09dbdc6 [formerly cf6992073f] [formerly 64a09dbdc6 [formerly cf6992073f] [formerly 0a245df4f1 [formerly 5b4555f7e94bf952b6e2323685e53e4708a8039b]]]
Former-commit-id: 0a245df4f1
Former-commit-id: 1e47f6f03a [formerly b67f0a616f]
Former-commit-id: 97d3beb64b
2014-04-25 13:26:10 -05:00
Richard Peter
928de60c87 Issue #2995: Update DB Class Finder to search all plugin jars
Change-Id: I42b5207372aa9d6f07afff0d18819c60b85fb3f8

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

Change-Id: I4c572c3f7d2bef1bdd0b9a596f916e29f8e53410

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

Former-commit-id: c14497b1b7 [formerly 2426e463f7] [formerly c14497b1b7 [formerly 2426e463f7] [formerly 6ca193b8e9 [formerly 33197dc6708b65e85233b51be1e99e6411ece60f]]]
Former-commit-id: 6ca193b8e9
Former-commit-id: 48bc49fd4b [formerly 2e8b8c6e86]
Former-commit-id: c0fd32360d
2014-04-25 10:56:43 -05:00
Brian.Dyke
f31d8cc8cf 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: f0b8ea5822 [formerly fb1f5aa593] [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bf3758efa3 [formerly 029f5753ad]
Former-commit-id: c6d3fe6952
2014-04-25 11:06:11 -04:00
Shawn.Hooper
bfee40353b ASM #224 - WarnGen: OB13.5.2 Template Errors
Change-Id: I99339c0ea3d0110ca855dd3db82b41b28a32dd6d

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

Former-commit-id: 066515b7c5 [formerly 4f9620bb04] [formerly 066515b7c5 [formerly 4f9620bb04] [formerly 18e79fe08d [formerly 749922901de5a57c7344f29def844a5ecf90304a]]]
Former-commit-id: 18e79fe08d
Former-commit-id: 0a58f699aa [formerly 22d24534e4]
Former-commit-id: 26475d2081
2014-04-25 09:09:38 -05:00
Richard Peter
15e9fe0da3 Merge "Issue #2726: Add hooks to stop archiving processes during shutdown." into development
Former-commit-id: 5b3ffb51b0 [formerly 0b765efce0] [formerly 5b3ffb51b0 [formerly 0b765efce0] [formerly 225d95171c [formerly 98e0a18741b559dff887db980d95965edf5f7cae]]]
Former-commit-id: 225d95171c
Former-commit-id: 7371d8ccdd [formerly 02d1cf94b0]
Former-commit-id: e628067527
2014-04-24 19:15:56 -05:00
Richard Peter
dcd2468bee Issue #2726: Add hooks to stop archiving processes during shutdown.
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a

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

Former-commit-id: 91df50ded7 [formerly 6cbd35aa47] [formerly 91df50ded7 [formerly 6cbd35aa47] [formerly e1eaca8071 [formerly e7963b0bcea141f33a00c264b26ae264d00f3abf]]]
Former-commit-id: e1eaca8071
Former-commit-id: 8ecae7aeb5 [formerly 4f41761508]
Former-commit-id: 43d4544229
2014-04-24 15:04:54 -05:00
Slav Korolev
cd38f3636d Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs.
Former-commit-id: 150a132320 [formerly 689930c484] [formerly 150a132320 [formerly 689930c484] [formerly f458f75ecf [formerly 879a50a60209abf95752c178a0266cdd42bde012]]]
Former-commit-id: f458f75ecf
Former-commit-id: 27095ecca8 [formerly e78c6edb8c]
Former-commit-id: 1bf6d72572
2014-04-24 15:40:52 -04:00
Brian.Dyke
d6e931dd87 Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: a5c9321a8d [formerly a61af3e6d3] [formerly a5c9321a8d [formerly a61af3e6d3] [formerly ac74878ae2 [formerly 48184880ce65a4899a4ed989f2d3f8082771047f]]]
Former-commit-id: ac74878ae2
Former-commit-id: ae4aea9abf [formerly c21644c87f]
Former-commit-id: b3a733036c
2014-04-24 13:28:31 -04:00
Brian.Dyke
378332d8bb Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: eff27f5504 [formerly a19f01c620] [formerly eff27f5504 [formerly a19f01c620] [formerly e82fc8f89c [formerly 4e921dbeab89e61635144b441ae0015155376c59]]]
Former-commit-id: e82fc8f89c
Former-commit-id: af2d8f5bad [formerly df6f06bef5]
Former-commit-id: 0fa669acce
2014-04-24 13:01:50 -04:00
David Gillingham
99b4c52d36 Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data.
Change-Id: I750323b3330016a98eef9778e8491ac920ea77ec

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

Former-commit-id: 7c3d99cf91 [formerly 27d5639b58] [formerly 7c3d99cf91 [formerly 27d5639b58] [formerly b1d43ae61a [formerly 60c4d87b387b3902fb0feacbf48807490b17e90c]]]
Former-commit-id: b1d43ae61a
Former-commit-id: cf611f1186 [formerly 5034bcd8fe]
Former-commit-id: 5382d8cc16
2014-04-23 17:24:41 -05:00