Commit graph

5916 commits

Author SHA1 Message Date
Xuezhi.Wei
6911a1f357 ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2

Former-commit-id: 81ec03e291 [formerly bdbeec662c] [formerly 81ec03e291 [formerly bdbeec662c] [formerly 33b235a0a4 [formerly f7b5f3bbc71cc251e19f1764ee7756050895b7a3]]]
Former-commit-id: 33b235a0a4
Former-commit-id: e2f7548351 [formerly 445d58699a]
Former-commit-id: ae0a348358
2014-06-06 17:40:09 +00:00
Juliya Dynina
c5d4d8308e Merge "ASM #114 - Problem with Distance Speed Tool." into asm_14.2.2
Former-commit-id: 21cd415434 [formerly 80a83bd44c] [formerly 21cd415434 [formerly 80a83bd44c] [formerly 87216a87de [formerly 1e1c7cbcee94e782338d440d585a3217ad606725]]]
Former-commit-id: 87216a87de
Former-commit-id: 8d89e35985 [formerly b6a4959e21]
Former-commit-id: 93c2e97e2e
2014-06-06 09:50:36 -05:00
Sean Webb
45d5701876 Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: e0f9eabb45 [formerly 016648ffaf] [formerly e0f9eabb45 [formerly 016648ffaf] [formerly cb43d21243 [formerly 5556e19903965bea22ca2f11b51fcc1c95cb07f8]]]
Former-commit-id: cb43d21243
Former-commit-id: b35f945bec [formerly c52983ab68]
Former-commit-id: 4e6fa39e5e
2014-06-05 15:03:11 -05:00
Fay.Liang
1ddb7a2b0b ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7

Former-commit-id: fa2cdbfac1 [formerly d1aa160aa7] [formerly fa2cdbfac1 [formerly d1aa160aa7] [formerly c5e6daa943 [formerly fc06896ae4d9adf0973522313f5e65df6ac67fa4]]]
Former-commit-id: c5e6daa943
Former-commit-id: 40eeef7fd1 [formerly 39efc11cb3]
Former-commit-id: ce1e19955e
2014-06-05 15:49:27 -04:00
Chip Gobs
5fa38e2acd VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse.
Change-Id: I096cc2e9c60a5aa26662e5fccc6692c3ce4f875d

Former-commit-id: a5c4402f34 [formerly 83ac596f9e] [formerly a5c4402f34 [formerly 83ac596f9e] [formerly 036d1c4d31 [formerly 6944361d04e7462f768bb74f00780dc8b8a51225]]]
Former-commit-id: 036d1c4d31
Former-commit-id: 8edb6c28d8 [formerly 6fd88e5422]
Former-commit-id: e9c140b3fc
2014-06-05 13:37:02 -04:00
Stephen Gilbert
7becf8d6da VLab Issue #3648 - Corrected NCEP additions for ESTOFS model
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b

Former-commit-id: 11cf39ce44 [formerly b7d93ed06d] [formerly 11cf39ce44 [formerly b7d93ed06d] [formerly d49482965e [formerly c681ba369a486f3ff3c7a324837a78e9c5594b4b]]]
Former-commit-id: d49482965e
Former-commit-id: 1a06e43797 [formerly 9ede855df5]
Former-commit-id: e1e95a36fe
2014-06-05 12:06:35 -04:00
Mike Duff
c2751cf532 Issue #3222 - Fix for SHEF posting times
Former-commit-id: 28a42f3f10 [formerly 8a5acd085d] [formerly 28a42f3f10 [formerly 8a5acd085d] [formerly f5f101d416 [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]]]
Former-commit-id: f5f101d416
Former-commit-id: 8e6a50e2ee [formerly 87d41ff302]
Former-commit-id: a615c41a57
2014-06-05 09:35:07 -05:00
Michael Gamazaychikov
94595e6af4 ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75

Former-commit-id: e5a9fa0827 [formerly c07bcacbf8] [formerly e5a9fa0827 [formerly c07bcacbf8] [formerly 50ab77046b [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]]
Former-commit-id: 50ab77046b
Former-commit-id: a2423cfadc [formerly 5efb82ea3e]
Former-commit-id: 29e197404f
2014-06-05 13:43:04 +01:00
Brian.Dyke
bf96a4ea21 ASM #557 - Removed rh6 dependency from wxgtk rpm requirements...modified spec file
Former-commit-id: de6a06bc8c [formerly d708eeb7d8] [formerly de6a06bc8c [formerly d708eeb7d8] [formerly 7db87d6ccb [formerly f671db68bfab4b9c17eb25050468e5b6306e6359]]]
Former-commit-id: 7db87d6ccb
Former-commit-id: c00bc1d654 [formerly bce3dc1bef]
Former-commit-id: c2d725a60c
2014-06-04 11:52:00 -04:00
Brian.Dyke
cdbcdb6cbd Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: feb26ee9b7 [formerly 61b206be0b] [formerly feb26ee9b7 [formerly 61b206be0b] [formerly 3919c9ec2f [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]]
Former-commit-id: 3919c9ec2f
Former-commit-id: 8f6e365ece [formerly 244467210c]
Former-commit-id: 75c6886f61
2014-06-04 07:46:16 -04:00
Brian.Dyke
ed90689b97 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 896aeeb2dd [formerly 2fb1e52728] [formerly 896aeeb2dd [formerly 2fb1e52728] [formerly 329393d172 [formerly 298cc5124ee8a8b12db45ae2d2c9505f0ae99857]]]
Former-commit-id: 329393d172
Former-commit-id: 24cb72d0b3 [formerly 7ef2c8d018]
Former-commit-id: f46f6c2953
2014-06-04 07:41:40 -04:00
Brian.Dyke
db5e13d110 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 2db2536d02 [formerly 6437ee2322] [formerly 2db2536d02 [formerly 6437ee2322] [formerly 696bf39f26 [formerly 785b4a8b95ad78d84b6e68f4d3917c7142d4a3ce]]]
Former-commit-id: 696bf39f26
Former-commit-id: f8dc753d82 [formerly 444630b0ba]
Former-commit-id: de337823ba
2014-06-04 07:41:28 -04:00
Kenneth Sperow
ca67a59e23 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: a59743ebe0 [formerly c302ef8967] [formerly a59743ebe0 [formerly c302ef8967] [formerly f2a738cc25 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]]
Former-commit-id: f2a738cc25
Former-commit-id: 1ba5f0a3c4 [formerly ca913b6159]
Former-commit-id: 3e94502542
2014-06-03 20:55:29 -07:00
brian.dyke
65f4a41200 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 789482b0e3 [formerly 79f866fb17] [formerly 789482b0e3 [formerly 79f866fb17] [formerly b3d95ca18d [formerly 2d4751c000176447d28b284337fb23a60cb19cd1]]]
Former-commit-id: b3d95ca18d
Former-commit-id: 05dfb0b2a5 [formerly 76cbdf64ff]
Former-commit-id: 21721fd935
2014-06-03 16:14:16 -04:00
Zhidong.Hao
33086a8085 ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325

Former-commit-id: ccbda4db4f [formerly 26c6801620] [formerly ccbda4db4f [formerly 26c6801620] [formerly 71ab6b9ed0 [formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]]]
Former-commit-id: 71ab6b9ed0
Former-commit-id: 9094e822e0 [formerly e5c47a51eb]
Former-commit-id: 3a9abec04b
2014-06-03 11:55:32 -04:00
Steve Harris
372e442eb4 Merge branch 'master_14.3.1' (14.3.1-9) into omaha_14.3.1
Former-commit-id: 49732fbdb2 [formerly b3b768ee87] [formerly 49732fbdb2 [formerly b3b768ee87] [formerly 78fc4d83f9 [formerly 4618c3ab6ae346649438d497712e4a8ab2ae91bd]]]
Former-commit-id: 78fc4d83f9
Former-commit-id: 61758b5fda [formerly e6f5716104]
Former-commit-id: 7cf41604ff
2014-06-02 14:29:39 -05:00
Steve Harris
4a8e870d72 Issue #2754 - added .project file to ohd/com.raytheon.uf.edex.ohd.feature/
Former-commit-id: f4ff7a4d9c [formerly 4c41c736b1] [formerly f4ff7a4d9c [formerly 4c41c736b1] [formerly 29e4453e2b [formerly dd6245e5abd2973fd47e0cc5ca1b79470122181c]]]
Former-commit-id: 29e4453e2b
Former-commit-id: 8bca727f50 [formerly bcaeec11a1]
Former-commit-id: 2f86829213
2014-06-02 14:04:01 -05:00
Sean.Webb
1ad2deb3cc Merge "ASM #550 - Remove ITO call from monitor_qpid_hosts.sh" into asm_14.3.1
Former-commit-id: 4fb31698c4 [formerly 304678c79b] [formerly 4fb31698c4 [formerly 304678c79b] [formerly 69c5318fe7 [formerly 1e0452f11fbbc45406b0652c0caa3ec800bfa6f7]]]
Former-commit-id: 69c5318fe7
Former-commit-id: b1d640b382 [formerly 23c7b64c54]
Former-commit-id: 4c115b174d
2014-06-02 10:15:07 -05:00
Steve Harris
9aa3a5a035 Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1
Former-commit-id: 4e26e224fd [formerly 65a3390a6a] [formerly 4e26e224fd [formerly 65a3390a6a] [formerly 3bde6b3e41 [formerly ee696cb24c8d72f0562126a131824e958b88f090]]]
Former-commit-id: 3bde6b3e41
Former-commit-id: 0edb16b05e [formerly c3deafc840]
Former-commit-id: 46b7122d56
2014-06-02 07:31:14 -05:00
Brian.Dyke
106a921a4c Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: de2df4cb6f [formerly b8ba378862] [formerly de2df4cb6f [formerly b8ba378862] [formerly c6244e1950 [formerly dec7b6fa091cab098b89a51551fa46b9f28b959b]]]
Former-commit-id: c6244e1950
Former-commit-id: 30f72a9337 [formerly 6edbd149a5]
Former-commit-id: 45deec5df6
2014-06-02 07:01:37 -04:00
Sean.Webb
1db1f40b55 Merge "ASM #557 - Removed rh6 dependency from wxgtk rpm requirements" into asm_14.3.1
Former-commit-id: 411b64da45 [formerly e46c62660b] [formerly 411b64da45 [formerly e46c62660b] [formerly 94f2a4ab2a [formerly ca4cde97f7304f94bb990dcd53ac39e06c09c7de]]]
Former-commit-id: 94f2a4ab2a
Former-commit-id: 893598ad2f [formerly ae1a95e55b]
Former-commit-id: c3f6e5513b
2014-05-30 14:42:34 -05:00
Sean.Webb
fa531fa4b1 ASM #557 - Removed rh6 dependency from wxgtk rpm requirements
Change-Id: I5a59edfb974c945a4d382fad109e513e3a51eeee

Former-commit-id: ba4f3b92ce [formerly af990fb412] [formerly ba4f3b92ce [formerly af990fb412] [formerly 73c2add28e [formerly bba964bd6af7d307a27ee85b11bce03d79f52e97]]]
Former-commit-id: 73c2add28e
Former-commit-id: 84dd29ce87 [formerly 7223f7454e]
Former-commit-id: 7b3b92913d
2014-05-30 14:40:44 -04:00
Sean.Webb
d9abb4bf75 ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03

Former-commit-id: d899f42637 [formerly c05e8e319e] [formerly d899f42637 [formerly c05e8e319e] [formerly 75f8e82eeb [formerly 88147ed5e5cd84e40acf61ad46d1baa554fd4e28]]]
Former-commit-id: 75f8e82eeb
Former-commit-id: a6a5887fe8 [formerly 43bf2d622f]
Former-commit-id: 6677a8db47
2014-05-30 14:27:59 -04:00
Sean.Webb
a3403f9dc9 ASM #550 - Remove ITO call from monitor_qpid_hosts.sh
Change-Id: I685b7ea1f2ed6d1eeb91e933b76eee051a3332f8

Former-commit-id: fe087a93cb [formerly 3fff8c6164] [formerly fe087a93cb [formerly 3fff8c6164] [formerly 42b78d7ec0 [formerly 43c50503e9aadc3dc66cdbf6b50f18a642547f35]]]
Former-commit-id: 42b78d7ec0
Former-commit-id: 5a7c0a1805 [formerly 542f05aa9a]
Former-commit-id: 84bfcb364c
2014-05-30 14:09:16 -04:00
Brian.Dyke
9351315fd6 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: a0a879be7d [formerly a8737e18f0] [formerly a0a879be7d [formerly a8737e18f0] [formerly 3f1e12effc [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]
Former-commit-id: 3f1e12effc
Former-commit-id: 3961c75ecd [formerly 66aacd6578]
Former-commit-id: a23d371522
2014-05-30 10:46:25 -04:00
brian.dyke
45dd00f016 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 2c2bb61e95 [formerly 95c5dc49c1] [formerly 2c2bb61e95 [formerly 95c5dc49c1] [formerly 03cc2fbbfb [formerly 2e170e3e328804a56f65de7cec0f0e89d3f1aba4]]]
Former-commit-id: 03cc2fbbfb
Former-commit-id: b6623af1f7 [formerly e09bd1d283]
Former-commit-id: 3f9ac5ba24
2014-05-30 10:09:00 -04:00
brian.dyke
a5b2f384bf Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 2f53c2e385 [formerly 7dde6e1d04] [formerly 2f53c2e385 [formerly 7dde6e1d04] [formerly ee7c67f7b0 [formerly d7b707236a1ee3bca45dee26c10814d9e3c275c8]]]
Former-commit-id: ee7c67f7b0
Former-commit-id: 8b93c973d6 [formerly cf49a7217f]
Former-commit-id: 05f691d0cd
2014-05-30 10:07:12 -04:00
Matthew Howard
db35baefc8 Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: 099185c960 [formerly 781d0331ab] [formerly 099185c960 [formerly 781d0331ab] [formerly 8375a2af3e [formerly def2351f527613dd62a081161e5f3a87756493ec]]]
Former-commit-id: 8375a2af3e
Former-commit-id: 11216ced25 [formerly f68748bd63]
Former-commit-id: 04c0631701
2014-05-29 15:54:37 -05:00
Shawn.Hooper
a4de244bdb ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997

Former-commit-id: 08ad9a66cc [formerly fe567b2a5b] [formerly 08ad9a66cc [formerly fe567b2a5b] [formerly 5cf0579d20 [formerly 626ee991cd7e9dbfe52342abd9e3fd41b973f72a]]]
Former-commit-id: 5cf0579d20
Former-commit-id: 0fe034cc8b [formerly 2c476e2bb4]
Former-commit-id: 3cb14aecd9
2014-05-29 16:56:46 -04:00
Steve Harris
0571a7877b Merge branch 'master_14.2.2' (14.2.2-9,10,11) into omaha_14.2.2
Former-commit-id: 53645445fe [formerly c7ef7878f5] [formerly 53645445fe [formerly c7ef7878f5] [formerly 9313e045bf [formerly 03b376033b3374694bc8a6e0a2c55b830db058e1]]]
Former-commit-id: 9313e045bf
Former-commit-id: 947d44c945 [formerly e92b927c5a]
Former-commit-id: ba06fa79f9
2014-05-29 07:45:24 -05:00
Brian.Dyke
1bae94a61a 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: 47a37b112a [formerly b7ef9420e1] [formerly 47a37b112a [formerly b7ef9420e1] [formerly 574246b6d4 [formerly f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]]]
Former-commit-id: 574246b6d4
Former-commit-id: 45d59380ea [formerly 2c1fabb0f8]
Former-commit-id: 551def9f1a
2014-05-28 16:25:33 -04:00
Shawn Hooper
bc0d8972ed Merge "ASM #600 - the fixes for DR 17380" into asm_14.3.1
Former-commit-id: 1f036b4573 [formerly 422473b8a0] [formerly 1f036b4573 [formerly 422473b8a0] [formerly 87d98c31fb [formerly 25235d87722f50f4bd034002f2b9d7f1f9dfcd42]]]
Former-commit-id: 87d98c31fb
Former-commit-id: 82fd8d413d [formerly 7def8a109d]
Former-commit-id: c75cda44b3
2014-05-28 13:04:45 -05:00
Brian.Dyke
992186e641 Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: 6f64664e70 [formerly 4c010cf27a] [formerly 6f64664e70 [formerly 4c010cf27a] [formerly ce81b44f32 [formerly b92ce0c1589c48de73387c142f1302409a3b0cb7]]]
Former-commit-id: ce81b44f32
Former-commit-id: 4f434e1bf9 [formerly 73ec45c5b2]
Former-commit-id: f5bc17ef24
2014-05-28 09:36:15 -04:00
Steve Harris
1f24080b8e 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: a4825f4b27 [formerly 2c49d14c12] [formerly a4825f4b27 [formerly 2c49d14c12] [formerly 048d3748b7 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]]
Former-commit-id: 048d3748b7
Former-commit-id: 005e5b4ee2 [formerly 4ed44b6e72]
Former-commit-id: 95462b4f80
2014-05-28 07:41:42 -05:00
Brian.Dyke
befec4cf01 CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: 089b2559bb [formerly e95ee60224] [formerly 089b2559bb [formerly e95ee60224] [formerly e852623f48 [formerly c85d4369600bfc24405386aa71713d7f2d58b201]]]
Former-commit-id: e852623f48
Former-commit-id: f07b83ce91 [formerly b745ac5926]
Former-commit-id: 21112face5
2014-05-28 08:40:56 -04:00
Fay.Liang
b1f0d4db14 ASM #600 - the fixes for DR 17380
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a

Former-commit-id: d57ebaad64 [formerly 0b9a011c58] [formerly d57ebaad64 [formerly 0b9a011c58] [formerly f56d9511b8 [formerly 445239c00cbe2147c014e180570085be6224da79]]]
Former-commit-id: f56d9511b8
Former-commit-id: 1411895d5d [formerly b77277b80e]
Former-commit-id: 247f3817be
2014-05-27 16:04:22 -04:00
David Friedman
9240b52ae4 Merge "ASM #512 - Need radar data watchdog functionality" into asm_14.3.1
Former-commit-id: 2566b64668 [formerly a57e547697] [formerly 2566b64668 [formerly a57e547697] [formerly 602150ea73 [formerly 9de711dfd85512d7bbdee2c91132d5250373c676]]]
Former-commit-id: 602150ea73
Former-commit-id: 8e0ec97eff [formerly c7eb18fc66]
Former-commit-id: 0c84a74214
2014-05-27 15:03:48 -05:00
Daniel.Huffman
4fc007a417 ASM #512 - Need radar data watchdog functionality
Change-Id: I54bb10185d5940d27417d1d40e21310ed5aeb8e3

Former-commit-id: 343046c159 [formerly eab2733238] [formerly 343046c159 [formerly eab2733238] [formerly 8326f42ed8 [formerly b3f33a3c49607219a234bede34bd983178151f39]]]
Former-commit-id: 8326f42ed8
Former-commit-id: 1bd20432a3 [formerly b63c845a2b]
Former-commit-id: 0503a4f11d
2014-05-27 19:59:53 +00:00
Steve Harris
172cca39d9 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: 3de24b7b07 [formerly 99bc6f990c] [formerly 3de24b7b07 [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: bfa4255eea [formerly 9b98b41cd4]
Former-commit-id: 144354c369
2014-05-27 14:48:24 -04:00
Brian.Dyke
d078a2630e Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-9 into 14.2.1
Former-commit-id: ea618935d0 [formerly 575cebda84] [formerly ea618935d0 [formerly 575cebda84] [formerly 638acc2c06 [formerly 34c582add16be1620f400d78d2f37da8c534f71a]]]
Former-commit-id: 638acc2c06
Former-commit-id: 2ab1fc6ddf [formerly 290b85b556]
Former-commit-id: 09f2d8b8b1
2014-05-27 13:42:09 -04:00
Brian.Dyke
7e5475923c CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: 4a1b6d70c4 [formerly 89a8caddbb] [formerly 4a1b6d70c4 [formerly 89a8caddbb] [formerly ba8d7dbbb7 [formerly d57f7989982a59a546116b63a406294573844039]]]
Former-commit-id: ba8d7dbbb7
Former-commit-id: bb5d88be66 [formerly ebdd53742c]
Former-commit-id: 1a69aaf89a
2014-05-27 13:30:35 -04:00
Fay.Liang
2ac429bff7 ASM #596 - Watch wording not properly inserted into some warning products
Change-Id: I7dc223d95f06a6a259e969cfbb8e4bde2f4b9192

Former-commit-id: 17f1404221 [formerly c007420e22] [formerly 17f1404221 [formerly c007420e22] [formerly 4fa60f159a [formerly ed8cd169fe0a531d0d83411f7b1afe787088d406]]]
Former-commit-id: 4fa60f159a
Former-commit-id: 3ed3e2249d [formerly 5d763a0f3d]
Former-commit-id: 605c976986
2014-05-23 15:47:50 -04:00
Steve Harris
d3a614b5d8 Merge branch 'master_14.3.1' (14.3.1-6) into omaha_14.3.1
Former-commit-id: 31711d4c5a [formerly 7dc84f4c74] [formerly 31711d4c5a [formerly 7dc84f4c74] [formerly b059918699 [formerly 36b00a413b977ef5e11a46cf6f3d575e39ee4b57]]]
Former-commit-id: b059918699
Former-commit-id: 16e2265208 [formerly 440d6b16cf]
Former-commit-id: af2f9d8a72
2014-05-23 08:09:39 -05:00
brian.dyke
75170fef57 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: cfa4b886f9 [formerly 53de0233a4] [formerly cfa4b886f9 [formerly 53de0233a4] [formerly 1976d2e1fd [formerly 861a76d237eb18effd3bc52731875b10b84389d4]]]
Former-commit-id: 1976d2e1fd
Former-commit-id: 03cfa48b9e [formerly 4d7c60dbc5]
Former-commit-id: 07192fa176
2014-05-23 08:58:39 -04:00
Kenneth Sperow
2eccad65df Merge remote branch 'origin/master_14.3.1' into mdl_14.3.1
Former-commit-id: 3a1925bf06 [formerly 07881695e9] [formerly 3a1925bf06 [formerly 07881695e9] [formerly dae982a2be [formerly ae21d53409ab3c839774f8621d706f1bea5456de]]]
Former-commit-id: dae982a2be
Former-commit-id: 3b1b46f0f9 [formerly 44bbe7733e]
Former-commit-id: fd53b08211
2014-05-22 14:58:37 -07:00
Kenneth Sperow
386365e3cb Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to b803dd72d5fdfacc2e43bec18b5e83d6208a667d [formerly 342398e6a3] [formerly 476c78a2d7 [formerly 189e3cc1f2] [formerly 476c78a2d7 [formerly 189e3cc1f2] [formerly 342398e6a3 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]]]]
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Change-Id: I2005791595cbb8303d385ed4c397e1997e7ce38f

Former-commit-id: 6f8b069dbe [formerly 8490f7ea33] [formerly 6f8b069dbe [formerly 8490f7ea33] [formerly 9fa9425aea [formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]]]
Former-commit-id: 9fa9425aea
Former-commit-id: 7302462544 [formerly 846395fd42]
Former-commit-id: 51b0b4e566
2014-05-22 14:16:49 -07:00
Steve Harris
5aca60f422 Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
Former-commit-id: 0a3b23d055 [formerly 4899c4f56a] [formerly 0a3b23d055 [formerly 4899c4f56a] [formerly 2059fc9c0e [formerly eae5c3e75061566e40194730c2cfb2003d952e62]]]
Former-commit-id: 2059fc9c0e
Former-commit-id: 805aae1a70 [formerly 0df4af413b]
Former-commit-id: e7e48b2abb
2014-05-22 14:05:06 -05:00
Steve Harris
4a2ed02d2c Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2
Former-commit-id: 1e34c7eda3 [formerly 3ed42be350] [formerly 1e34c7eda3 [formerly 3ed42be350] [formerly acecfd7dfa [formerly a125cbc03cc5cace25e35b3516c34f9d7060a78e]]]
Former-commit-id: acecfd7dfa
Former-commit-id: efafb08e74 [formerly fdaf7083f5]
Former-commit-id: 8b68aea03b
2014-05-22 13:52:02 -05:00
Stephen Gilbert
06d85fccc6 VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
Removed dependency on persistCamelRegistered from ncgrib spring config

Change-Id: I84e7b6fc6e50f9d1795e887a9fb30f9cdda3a7f8

Former-commit-id: 0dff405bc4 [formerly 3b8233dd88] [formerly 0dff405bc4 [formerly 3b8233dd88] [formerly 4299e7c72c [formerly a7140f38a54a577dd2d62cc551ab182b561f6fc0]]]
Former-commit-id: 4299e7c72c
Former-commit-id: 2c50057a68 [formerly e07ae7a2f2]
Former-commit-id: e7f7a9be50
2014-05-22 14:35:49 -04:00
Stephen Gilbert
e2f79fb8a8 Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: 651f6a2e9c [formerly 8a3ab16e46] [formerly 651f6a2e9c [formerly 8a3ab16e46] [formerly e73836f3b5 [formerly d2d54ee2bfbbe6fef44df58d2edc3b5858ffbe22]]]
Former-commit-id: e73836f3b5
Former-commit-id: 71730ae2ec [formerly 571cc69cf3]
Former-commit-id: 98c83bf2d8
2014-05-22 13:31:12 -04:00