Commit graph

325 commits

Author SHA1 Message Date
Ana Rivera
2f13aed851 VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e

Conflicts:
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 4c585af933 [formerly 9ada9356c5 [formerly 7fa5b7a34613e88a77e4b32c79c6d8c3c6166ba2]]
Former-commit-id: 9ada9356c5
Former-commit-id: 11073fdece
2014-08-15 11:04:23 -05:00
Ana Rivera
0a812a313d VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 9bf2df23be [formerly a44d5d91db [formerly b7815d59250a73ee587d57bd2ece84691fe8707c]]
Former-commit-id: a44d5d91db
Former-commit-id: 1daa44291e
2014-08-15 11:02:36 -05:00
Ana Rivera
a258f0f812 VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml

Former-commit-id: 95451b2959 [formerly a053fd5bad [formerly d95450f2eebc6b3d10093bd16736b349a1d0b12b]]
Former-commit-id: a053fd5bad
Former-commit-id: cc354742e1
2014-08-15 11:01:23 -05:00
Rici.Yu
9b78be1622 ASM #15655 - Negate raising exception for empty db from IFPDB()
Change-Id: I5c96d654f3080a4b0f10113648f290a0d09961cb

Former-commit-id: 661737fb39 [formerly 9a1310d1ac [formerly 9af51efbef229984de09a5ad338885d54f720270]]
Former-commit-id: 9a1310d1ac
Former-commit-id: a75c0c2f15
2014-07-28 11:30:49 -04:00
Brian.Dyke
6fe1fbbd47 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 3d6c40b341 [formerly cef9771fe1 [formerly 69c55eff70bbfb445bdd9bf708ed5e4df896b42a]]
Former-commit-id: cef9771fe1
Former-commit-id: cd099c0902
2014-07-24 09:03:57 -04:00
Shawn.Hooper
11196e7275 ASM #15630 - Check-in fix for GFE: Missing ISC Wind Grids on behalf of Ron Anderson
Change-Id: I9053182b6c02d6c77e10e23b017b94bcff4da58b

Former-commit-id: ae272328a3 [formerly 2a32d5945c [formerly 4bca3ffd258a6869150154e93abb652a1f22bc4d]]
Former-commit-id: 2a32d5945c
Former-commit-id: a70786ff22
2014-07-22 15:59:22 -04:00
Shawn Hooper
c3c267fbdc Revert "ASM #15630 -- GFE: Missing ISC Wind Grids"
This reverts commit 4c06eca38e [formerly 212fcd9eb4] [formerly a5791db7cb] [formerly 8de6be5219 [formerly a5791db7cb [formerly db678db964b46a46e062cd0602cf9ce8bc96e4cd]]].

Change-Id: Ib5d03f81b35c0371e063a89739b823b8264c439f

Former-commit-id: 65802e34fd [formerly 425bcea65d [formerly 7dcfb55353ba7ec9d0619737da37781b0b186e5d]]
Former-commit-id: 425bcea65d
Former-commit-id: faf934a05a
2014-07-22 10:15:46 -05:00
Ron Anderson
e0bfbb796b Issue #3415 Fixed d2dGridDataPurged to not purge NetCDF databases.
Change-Id: Ie52a5b8c46d58cb39acde27f0ebdde0c42fdfa67

Former-commit-id: 6ea726136b [formerly f3a6393b96 [formerly a2362b68b103c9013d615815924514ebe44be147]]
Former-commit-id: f3a6393b96
Former-commit-id: 7903a20dbc
2014-07-21 12:47:12 -05:00
Fay.Liang
4c06eca38e ASM #15630 -- GFE: Missing ISC Wind Grids
Change-Id: I289f1fafac8e034faa38dcddf639d5744fabe901

Former-commit-id: 8de6be5219 [formerly a5791db7cb [formerly db678db964b46a46e062cd0602cf9ce8bc96e4cd]]
Former-commit-id: a5791db7cb
Former-commit-id: 212fcd9eb4
2014-07-21 12:57:21 -04:00
Ron Anderson
8c0311507b Issue #3317 Fix merge problem that removed GFE notification of D2D purge
Change-Id: I925b7287bdb2fb7f9c330b05b1b2c32031e693d9

Former-commit-id: a6956a8ccd [formerly ead09dd683 [formerly 04805a8957ef14754225f85f4722d8302cde8df3]]
Former-commit-id: ead09dd683
Former-commit-id: 5dd7a035ac
2014-06-25 19:12:51 +00:00
Ron Anderson
cdef6bd26c Issue #3317 Fix issue with obsolete D2DGridDatabases not getting purged.
Change-Id: If792327215bb9f8db470c95099463e735c462d46

Former-commit-id: 2ac9cd84ec [formerly 898b30fadb [formerly 2a84ea1af7bb767e9e85387de1fd90c662f9f91d]]
Former-commit-id: 898b30fadb
Former-commit-id: f76a2d3700
2014-06-25 13:21:32 -05:00
Steve Harris
869235c02a CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)

Conflicts:
	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.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java

Former-commit-id: 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]
Former-commit-id: b84dda5930
Former-commit-id: 16f5ff0979
2014-06-20 14:01:55 -04:00
Brian.Dyke
e3dc97e246 CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 8ecdd9a192 [formerly 399c06820a [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]
Former-commit-id: 399c06820a
Former-commit-id: be589ceb9b
2014-06-18 08:55:49 -04:00
Brian.Dyke
4766b3f49f CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 81832d97e5 [formerly 346bf852cd [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]
Former-commit-id: 346bf852cd
Former-commit-id: 5064d24e26
2014-06-13 13:21:19 -04:00
Brian.Dyke
7056d79f70 Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 9ab17ddecb [formerly f72380ad60 [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]
Former-commit-id: f72380ad60
Former-commit-id: 0f07e14bf1
2014-06-10 13:56:03 -04:00
Brian.Dyke
64a10ce12d CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: 8874d41872 [formerly c1b3f9d180 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]
Former-commit-id: c1b3f9d180
Former-commit-id: ef5c74dece
2014-06-10 12:52:59 -04:00
Fay.Liang
46926b679d ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7

Former-commit-id: c5e6daa943 [formerly d1aa160aa7 [formerly fc06896ae4d9adf0973522313f5e65df6ac67fa4]]
Former-commit-id: d1aa160aa7
Former-commit-id: fa2cdbfac1
2014-06-05 15:49:27 -04:00
Brian.Dyke
f9a40a24e3 Merge remote-tracking branch 'remotes/origin/master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-5 into 14.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	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

Former-commit-id: c8f21e92fe [formerly b066572041 [formerly d75db45cdfa20fed7568b825ca0dfd8c8689d22a]]
Former-commit-id: b066572041
Former-commit-id: 2de7de6378
2014-05-15 16:40:47 -04:00
Brian.Dyke
ac7b375d91 CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: c81d54b651 [formerly 81a1affe22 [formerly 11acfb00bda7686c68e24903df4831cf57bf86de]]
Former-commit-id: 81a1affe22
Former-commit-id: 08f69fd3a1
2014-05-15 14:16:38 -04:00
Steve Harris
010301045d 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: 1c8f2f6185 [formerly 6ef3b9f1e5 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]
Former-commit-id: 6ef3b9f1e5
Former-commit-id: 9e149df799
2014-05-05 08:21:02 -05:00
Steve Harris
3c02cbbcc9 Merge branch 'master_14.2.1' (14.2.1-19,20) into omaha_14.2.1
Change-Id: Ib48a2c15e266cd012aba975c25ef094b828a0f68

Former-commit-id: 18e79fe08d [formerly 4f9620bb04 [formerly 749922901de5a57c7344f29def844a5ecf90304a]]
Former-commit-id: 4f9620bb04
Former-commit-id: 066515b7c5
2014-04-25 09:09:38 -05:00
Brian.Dyke
81d39113fe Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: e82fc8f89c [formerly a19f01c620 [formerly 4e921dbeab89e61635144b441ae0015155376c59]]
Former-commit-id: a19f01c620
Former-commit-id: eff27f5504
2014-04-24 13:01:50 -04:00
Ron Anderson
6d77ebe181 Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID
Change-Id: Id2146e07f4e6103c9c96f2b09f0bae5980747052

Former-commit-id: 859d709a03 [formerly b12a6cd828 [formerly 6f141288cae462aac8c1ea8c77dd7f88a33c382a]]
Former-commit-id: b12a6cd828
Former-commit-id: db978fff9a
2014-04-22 14:38:54 -05:00
Zhidong.Hao
f32bb4e4f4 ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303

Former-commit-id: 0177756f97 [formerly e1d5aa284d [formerly 4e7edc8ebbd79c16d6eb725c8d11d05f20424ed4]]
Former-commit-id: e1d5aa284d
Former-commit-id: f16936223a
2014-04-22 14:31:14 -04:00
Brian.Dyke
9075808d0a Merged 13.5.5-1 into 1412
Former-commit-id: 35ad867281 [formerly 188d84cc87 [formerly f44629e87a6401a5b872c050b9cf79defd306171]]
Former-commit-id: 188d84cc87
Former-commit-id: 65ad515a6e
2014-04-16 12:09:12 -04:00
brian.dyke
33274850e3 Merge branch 'master_14.2.1' into asm_14.2.1
Former-commit-id: a6708cc174 [formerly fb1c399d4d [formerly 14cd23697c705352544609e7ba7a3afdf5d778b1]]
Former-commit-id: fb1c399d4d
Former-commit-id: 5fc07cafc8
2014-04-14 15:29:23 -04:00
Zhidong.Hao
a153f7218e ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1

Former-commit-id: 9c18f60924 [formerly 0b499061da [formerly 015d4307168ca7fbc70bf0ae0e2e9abd24463d90]]
Former-commit-id: 0b499061da
Former-commit-id: f5877f5fb0
2014-04-11 15:51:12 -04:00
Zhidong.Hao
8e54cb2958 ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c

Former-commit-id: 1a91b820d9 [formerly 009c6e067a [formerly 30eba1a2397c41fed1b564af4c31791040b14eac]]
Former-commit-id: 009c6e067a
Former-commit-id: 48ee7712c7
2014-04-11 15:34:06 -04:00
Brian.Dyke
b6e4e23394 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: 9cce8eb0d1 [formerly 8c2f601b59 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]
Former-commit-id: 8c2f601b59
Former-commit-id: 73be1016c0
2014-04-10 13:26:42 -04:00
Richard Peter
efd1003a50 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: b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: 95eba8dcf6
Former-commit-id: 5676090443
2014-04-09 16:00:54 -05:00
Brian.Dyke
2eec862ebb Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]
Former-commit-id: 6a28fcb156
Former-commit-id: 17477e7db1
2014-04-04 12:57:32 -04:00
David Gillingham
d14aee89aa Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1.
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9

Former-commit-id: 70b28b4e1e [formerly a529bc8cad [formerly e820f7ea4046e42ae1112fe8b1a0f8455dbc997d]]
Former-commit-id: a529bc8cad
Former-commit-id: 402adfeddb
2014-03-31 15:49:33 -05:00
Steve Harris
52226061e9 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: ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]
Former-commit-id: 069093884f
Former-commit-id: 3ba28aabea
2014-03-06 08:39:43 -06:00
Brian.Dyke
9158806dd2 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]
Former-commit-id: 2faab606e5
Former-commit-id: 363403fb34
2014-02-24 14:51:00 -05:00
Brian.Dyke
3508e488f5 OB_14.1.1-19 baseline
Former-commit-id: 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]
Former-commit-id: cfa4997978
Former-commit-id: 779553142c
2014-02-21 06:50:59 -05:00
Ron Anderson
410f956cff 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: 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]
Former-commit-id: 32bcf9d0d0
Former-commit-id: e7f2b6883d
2014-02-18 10:45:20 -06:00
Steve Harris
1b7e02636d Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 9fcc5ad930 [formerly 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]
Former-commit-id: 267cc881a4
Former-commit-id: d0352c69d4
2014-02-17 08:54:34 -06:00
Ron Anderson
69ee4792ad Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]
Former-commit-id: fcf45916f4
Former-commit-id: 3e78908bb5
2014-02-13 10:10:34 -06:00
Ron Anderson
0b73d0703e Issue #2719 Update NHA GFE domain
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c

Former-commit-id: ee89463d27 [formerly a665530831 [formerly 28008b46b5d68e544dace5f721b283c222701699]]
Former-commit-id: a665530831
Former-commit-id: 0f9b44ff94
2014-02-11 17:07:01 -06:00
Brian.Dyke
1f27652aa3 14.1.1-18 baseline
Former-commit-id: 1d6a9456b7 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]
Former-commit-id: 575e328123
Former-commit-id: f05a2220cd
2014-02-11 15:52:50 -05:00
Brian.Dyke
6510e6da5a Issue #88
Former-commit-id: edccef5569 [formerly 643ef1a1a6 [formerly 66a1b2ba9933754b0d6d0324108268563e6381bc]]
Former-commit-id: 643ef1a1a6
Former-commit-id: d56bdce6ff
2014-02-04 16:34:40 -05:00
Brian.Dyke
4c6eb0c001 14.1.1-17 baseline
Former-commit-id: 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]
Former-commit-id: 180d1356cd
Former-commit-id: f3d34b0c38
2014-02-04 12:33:46 -05:00
Ron Anderson
c717b6d805 Merge "Issue #2719 Add NHA domain to serverConfig.py" into omaha_14.2.1
Former-commit-id: 7c06f0b011 [formerly fb262fdad2 [formerly 2c3e2b9bf8bf01065d79221febe9e95a8efaa46e]]
Former-commit-id: fb262fdad2
Former-commit-id: 81f9709ae7
2014-01-29 14:16:31 -06:00
Ron Anderson
9215ca8f82 Issue #2719 Add NHA domain to serverConfig.py
Change-Id: Ia7c5026ab5b8ae4c9c00adaf90b01d9fa527a044

Former-commit-id: 0f6e082769 [formerly ce28c6c47f [formerly 2c8d067a3a4c4848bc2eb313c4e901507844074d]]
Former-commit-id: ce28c6c47f
Former-commit-id: ea12cecc04
2014-01-29 13:55:54 -06:00
David Gillingham
304eaa9f29 Issue #2170: Fix SPCWatchSrv and TPCWatchSrv spring routes, add exception handling for WCLWatchSrv route.
Former-commit-id: c802315ddc [formerly 5edfbaa4a5 [formerly 3dfffb5f49a84a6ed82481d08c809e1217750f70]]
Former-commit-id: 5edfbaa4a5
Former-commit-id: fc25bbe1e9
2014-01-29 11:56:05 -06:00
Ron Anderson
567c7b0fe5 Issue #2504 Change other GFESuite scripts to use iscUtil.getLogger for consistency
Change-Id: I4ce123e8030075bf4a247152dd053ba16dad6987

Former-commit-id: a54c44a6fb [formerly c133dc5506 [formerly b0357df1c4b82623f1345362ddd6ca57d514a1e6]]
Former-commit-id: c133dc5506
Former-commit-id: c353c4aa74
2014-01-24 17:01:40 -06:00
Ron Anderson
f9e56a01aa Issue #2504 Add hostname to log path for GFESuite scripts
Change-Id: I734d8f6ec89720d23371bd9c1187ef95eeaf22eb

Former-commit-id: e13a34a8b3 [formerly 25cf05060d [formerly 975cf49b49e6266081e7b9ebcce6782b3e411667]]
Former-commit-id: 25cf05060d
Former-commit-id: 2c3cad8a81
2014-01-24 09:04:11 -06:00
Ron Anderson
70c0e383d7 Issue #2720 Improve efficiency of merging polygons in edit area generation
Change-Id: I8fd83384431942fd71f30aba6053ee12af7d0eb4

Former-commit-id: 9805de99fa [formerly 8fde77b529 [formerly c1ab9bc049528eb33b311355f6b089e67ea4997d]]
Former-commit-id: 8fde77b529
Former-commit-id: bd3778fdd4
2014-01-21 13:25:31 -06:00
David Gillingham
23878cd0d0 Issue #2418: Fix PHISH parameter name case issues discovered in test.
Former-commit-id: 5401124a1f [formerly c0065ec2a9 [formerly a33e5eb63fe0ad7b9d79e878a9877500065a05a8]]
Former-commit-id: c0065ec2a9
Former-commit-id: 1179080434
2014-01-20 15:37:52 -06:00
Steve Harris
002b2492ac Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java

Former-commit-id: 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]
Former-commit-id: 454d557884
Former-commit-id: 5fcccbff1b
2014-01-20 10:17:44 -06:00