Commit graph

2809 commits

Author SHA1 Message Date
Ron Anderson
319819d3a7 Omaha #3296 A few more minor performance tweaks and some addtional logging.
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)

Former-commit-id: 4123073c4e [formerly 2c5f910f90 [formerly a0384ccfb30a877f14893c6cfa62d92117c0bb87]]
Former-commit-id: 2c5f910f90
Former-commit-id: c7a74ab5b1
2014-07-01 13:56:41 -04:00
Ron Anderson
1f056e7ab9 Omaha #3296 Added performance logging. Moved backup and purging to separate java thread. Cached PythonScript.
Change-Id: I9814345b512674269f17f4bf61bd615f0a50b059
(cherry picked from commit a11bcadd76eb9f9597e23ee609fd9cb364ad26ac)

Former-commit-id: 487c7ee30a [formerly beee08c32b [formerly 49638ba1e9561dea7b318b7adc0f1ab9571170f5]]
Former-commit-id: beee08c32b
Former-commit-id: 9818d9b485
2014-07-01 13:56:05 -04:00
Steve Harris
741dc31fcb Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5

Former-commit-id: 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]
Former-commit-id: d4dc1723c1
Former-commit-id: 2f2958df37
2014-07-01 11:08:46 -04:00
Mike Duff
0de6d3b92a Issue #3321 - Fix ingest switch checks
Change-Id: I7de7ee482ab57789874a179499e6c51079e68e12

Former-commit-id: d62c925baa [formerly f17c93bb19 [formerly 5df0ac7f96d1280c1c50f39982693f9503b56f14]]
Former-commit-id: f17c93bb19
Former-commit-id: 1d3aeb881b
2014-06-26 16:23:02 -05: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
7f040f069c Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: ddc6f2092a [formerly 89606076ec [formerly 174fe6d66525229f328846a1f4564300d7603c10]]
Former-commit-id: 89606076ec
Former-commit-id: 3f2058a1ab
2014-06-24 10:57:56 -05:00
Nate Jensen
ef9e4c2439 Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor

Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit e39ecf5473 [formerly 4558fe5862] [formerly 845483346f] [formerly 65eb76ff66 [formerly 845483346f [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]])

Former-commit-id: 65619399a0 [formerly ca27873204 [formerly f0ad63d2ccf347e92274701f9890e120b9e70140]]
Former-commit-id: a160f9e2840f0ab223e8e22743c49a053da45545 [formerly ca27873204]
Former-commit-id: 333f8317bb
2014-06-23 11:59:26 -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
Nate Jensen
e39ecf5473 Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor

Change-Id: I210ac789322c975cb93584facb3eec417f5097f2

Former-commit-id: 65eb76ff66 [formerly 845483346f [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]
Former-commit-id: 845483346f
Former-commit-id: 4558fe5862
2014-06-19 10:02:34 -05: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
Steve Harris
e67900933d Merge branch 'master_14.3.1' (14.3.1-10,11) into omaha_14.3.1
Former-commit-id: 6c82cc5c3d [formerly 1d2b8aeb7b [formerly 4041e8afbb4bf1c0c416624140d74d27e963f9c8]]
Former-commit-id: 1d2b8aeb7b
Former-commit-id: 0c3dcb77d5
2014-06-16 07:49:58 -05: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
c4ecd90117 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 6fcc2604e0 [formerly a011c0b6bb [formerly 0d441b5eebad07acf51d6d5c28ee5ac7770d9733]]
Former-commit-id: a011c0b6bb
Former-commit-id: e802508e98
2014-06-12 07:07:17 -04:00
Steve Harris
61cb3f45b4 Merge branch 'master_14.2.2' (14.2.2-13) into omaha_14.2.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: If5dae78936eddf1bc4ee63f35beb96a0cb9defb9

Former-commit-id: 9510608b74 [formerly ad6e9fa5ee [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]]
Former-commit-id: ad6e9fa5ee
Former-commit-id: 3a3277c469
2014-06-11 12:55:44 -05:00
Ana Rivera
c1e504cdfa VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e

Former-commit-id: 9da58db461 [formerly 65e90953c2 [formerly 83640ccce75b600d53a0d44ae1528c312b7947b5]]
Former-commit-id: 65e90953c2
Former-commit-id: 4b515bfd0a
2014-06-11 17:35:55 +00:00
Ben Steffensmeier
6f21122f93 Issue #2661 Fix vector derived parameter.
Former-commit-id: 0a66c47341 [formerly cd60dc028a [formerly 238043b8c4286e398176d4d6c78e585e33faa5da]]
Former-commit-id: cd60dc028a
Former-commit-id: 1f270a6059
2014-06-10 15:44:33 -05: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
Steve Harris
483d61f414 Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
Former-commit-id: bd98f04cde [formerly 14370245fd [formerly 65793ec4d12626b2d3365c5a0e8c3e229972b289]]
Former-commit-id: 14370245fd
Former-commit-id: 6e09bce335
2014-06-09 15:20:03 -05:00
Xuezhi.Wei
ba05b6f16a ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2

Former-commit-id: 33b235a0a4 [formerly bdbeec662c [formerly f7b5f3bbc71cc251e19f1764ee7756050895b7a3]]
Former-commit-id: bdbeec662c
Former-commit-id: 81ec03e291
2014-06-06 17:40:09 +00:00
Sean Webb
52283357c8 Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: cb43d21243 [formerly 016648ffaf [formerly 5556e19903965bea22ca2f11b51fcc1c95cb07f8]]
Former-commit-id: 016648ffaf
Former-commit-id: e0f9eabb45
2014-06-05 15:03:11 -05: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
Stephen Gilbert
bb2323b792 VLab Issue #3648 - Corrected NCEP additions for ESTOFS model
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b

Former-commit-id: d49482965e [formerly b7d93ed06d [formerly c681ba369a486f3ff3c7a324837a78e9c5594b4b]]
Former-commit-id: b7d93ed06d
Former-commit-id: 11cf39ce44
2014-06-05 12:06:35 -04:00
Mike Duff
3a3928cde3 Issue #3222 - Fix for SHEF posting times
Former-commit-id: f5f101d416 [formerly 8a5acd085d [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]]
Former-commit-id: 8a5acd085d
Former-commit-id: 28a42f3f10
2014-06-05 09:35:07 -05:00
Brian.Dyke
a91c426ee7 Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: 3919c9ec2f [formerly 61b206be0b [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]
Former-commit-id: 61b206be0b
Former-commit-id: feb26ee9b7
2014-06-04 07:46:16 -04:00
Brian.Dyke
cfd6da7fd4 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 329393d172 [formerly 2fb1e52728 [formerly 298cc5124ee8a8b12db45ae2d2c9505f0ae99857]]
Former-commit-id: 2fb1e52728
Former-commit-id: 896aeeb2dd
2014-06-04 07:41:40 -04:00
Brian.Dyke
942dd3ab92 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 696bf39f26 [formerly 6437ee2322 [formerly 785b4a8b95ad78d84b6e68f4d3917c7142d4a3ce]]
Former-commit-id: 6437ee2322
Former-commit-id: 2db2536d02
2014-06-04 07:41:28 -04:00
Kenneth Sperow
764ffeb440 Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml

Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8

Former-commit-id: f2a738cc25 [formerly c302ef8967 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]
Former-commit-id: c302ef8967
Former-commit-id: a59743ebe0
2014-06-03 20:55:29 -07:00
brian.dyke
17eb7729c7 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: b3d95ca18d [formerly 79f866fb17 [formerly 2d4751c000176447d28b284337fb23a60cb19cd1]]
Former-commit-id: 79f866fb17
Former-commit-id: 789482b0e3
2014-06-03 16:14:16 -04:00
Stephen Gilbert
71c163c91e Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: 27367bb167 [formerly dbceebc017 [formerly 677ce1ec784824c04d0bfe192b3c46a36e527640]]
Former-commit-id: dbceebc017
Former-commit-id: bcbc3ede79
2014-06-02 09:12:37 -04:00
Steve Harris
be2931c623 Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1
Former-commit-id: 3bde6b3e41 [formerly 65a3390a6a [formerly ee696cb24c8d72f0562126a131824e958b88f090]]
Former-commit-id: 65a3390a6a
Former-commit-id: 4e26e224fd
2014-06-02 07:31:14 -05:00
Brian.Dyke
4b0bf4f7af Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: c6244e1950 [formerly b8ba378862 [formerly dec7b6fa091cab098b89a51551fa46b9f28b959b]]
Former-commit-id: b8ba378862
Former-commit-id: de2df4cb6f
2014-06-02 07:01:37 -04:00
Brian.Dyke
5524d6b38d Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade

Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults

Former-commit-id: 3f1e12effc [formerly a8737e18f0 [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]
Former-commit-id: a8737e18f0
Former-commit-id: a0a879be7d
2014-05-30 10:46:25 -04:00
brian.dyke
f9cf99e369 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 03cc2fbbfb [formerly 95c5dc49c1 [formerly 2e170e3e328804a56f65de7cec0f0e89d3f1aba4]]
Former-commit-id: 95c5dc49c1
Former-commit-id: 2c2bb61e95
2014-05-30 10:09:00 -04:00
brian.dyke
e1f9c919e6 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: ee7c67f7b0 [formerly 7dde6e1d04 [formerly d7b707236a1ee3bca45dee26c10814d9e3c275c8]]
Former-commit-id: 7dde6e1d04
Former-commit-id: 2f53c2e385
2014-05-30 10:07:12 -04:00
Matthew Howard
d0880003a6 Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: 8375a2af3e [formerly 781d0331ab [formerly def2351f527613dd62a081161e5f3a87756493ec]]
Former-commit-id: 781d0331ab
Former-commit-id: 099185c960
2014-05-29 15:54:37 -05:00
Shawn.Hooper
4de35d0a2b ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997

Former-commit-id: 5cf0579d20 [formerly fe567b2a5b [formerly 626ee991cd7e9dbfe52342abd9e3fd41b973f72a]]
Former-commit-id: fe567b2a5b
Former-commit-id: 08ad9a66cc
2014-05-29 16:56:46 -04:00
Brian.Dyke
9e0cf9b945 Merge remote-tracking branch 'remotes/origin/master_14.2.1' into master_14.2.2 CM-MERGE:14.2.1-30 into 14.2.2
Former-commit-id: 574246b6d4 [formerly b7ef9420e1 [formerly f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]]
Former-commit-id: b7ef9420e1
Former-commit-id: 47a37b112a
2014-05-28 16:25:33 -04:00
Stephen Gilbert
15a969817f VLab Issue #3854 - EDEX plugins for remote script execution
Change-Id: I56c15e3f8c93d1c26c3dd0dc4091ffb21aceff86

Former-commit-id: 2eb77074ab [formerly 05a81e65d1 [formerly c02bc1656bf82dea215aba10168f22cab127e9bf]]
Former-commit-id: 05a81e65d1
Former-commit-id: 77a682e24c
2014-05-28 14:03:31 -04:00
Brian.Dyke
0fe87c550c Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: ce81b44f32 [formerly 4c010cf27a [formerly b92ce0c1589c48de73387c142f1302409a3b0cb7]]
Former-commit-id: 4c010cf27a
Former-commit-id: 6f64664e70
2014-05-28 09:36:15 -04:00
Steve Harris
835486c63f Merge branch 'master_14.3.1' (14.3.1-7) into omaha_14.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java

Former-commit-id: 048d3748b7 [formerly 2c49d14c12 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]
Former-commit-id: 2c49d14c12
Former-commit-id: a4825f4b27
2014-05-28 07:41:42 -05:00
Brian.Dyke
fba5604613 CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: e852623f48 [formerly e95ee60224 [formerly c85d4369600bfc24405386aa71713d7f2d58b201]]
Former-commit-id: e95ee60224
Former-commit-id: 089b2559bb
2014-05-28 08:40:56 -04:00
Fay.Liang
9bc5268f64 ASM #600 - the fixes for DR 17380
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a

Former-commit-id: f56d9511b8 [formerly 0b9a011c58 [formerly 445239c00cbe2147c014e180570085be6224da79]]
Former-commit-id: 0b9a011c58
Former-commit-id: d57ebaad64
2014-05-27 16:04:22 -04:00
Steve Harris
08308cd279 Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
	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_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_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_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	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/planesMenusPlanView.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]
Former-commit-id: 99bc6f990c
Former-commit-id: 3de24b7b07
2014-05-27 14:48:24 -04:00
Brian.Dyke
f3b0bdff29 Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-9 into 14.2.1
Former-commit-id: 638acc2c06 [formerly 575cebda84 [formerly 34c582add16be1620f400d78d2f37da8c534f71a]]
Former-commit-id: 575cebda84
Former-commit-id: ea618935d0
2014-05-27 13:42:09 -04:00
Brian.Dyke
86eefc2026 CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: ba8d7dbbb7 [formerly 89a8caddbb [formerly d57f7989982a59a546116b63a406294573844039]]
Former-commit-id: 89a8caddbb
Former-commit-id: 4a1b6d70c4
2014-05-27 13:30:35 -04:00
Fay.Liang
61c177c7b2 ASM #596 - Watch wording not properly inserted into some warning products
Change-Id: I7dc223d95f06a6a259e969cfbb8e4bde2f4b9192

Former-commit-id: 4fa60f159a [formerly c007420e22 [formerly ed8cd169fe0a531d0d83411f7b1afe787088d406]]
Former-commit-id: c007420e22
Former-commit-id: 17f1404221
2014-05-23 15:47:50 -04:00
Steve Harris
e8e7e88400 Merge branch 'master_14.3.1' (14.3.1-6) into omaha_14.3.1
Former-commit-id: b059918699 [formerly 7dc84f4c74 [formerly 36b00a413b977ef5e11a46cf6f3d575e39ee4b57]]
Former-commit-id: 7dc84f4c74
Former-commit-id: 31711d4c5a
2014-05-23 08:09:39 -05:00
Kenneth Sperow
79f11bb114 Merge remote branch 'origin/master_14.3.1' into mdl_14.3.1
Former-commit-id: dae982a2be [formerly 07881695e9 [formerly ae21d53409ab3c839774f8621d706f1bea5456de]]
Former-commit-id: 07881695e9
Former-commit-id: 3a1925bf06
2014-05-22 14:58:37 -07:00