Commit graph

5049 commits

Author SHA1 Message Date
Qinglu.Lin
77e6647de8 ASM #15700 - Warngen issues an error and toggles off on Radar update
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b

Former-commit-id: 3cc94603a2 [formerly fb92838427] [formerly 3cc94603a2 [formerly fb92838427] [formerly 2157a4aa3b [formerly b8a4741b2519e8c02a1b80ba8544be9b1c26d35c]]]
Former-commit-id: 2157a4aa3b
Former-commit-id: 787f157850 [formerly 3037a17366]
Former-commit-id: 040e1071b2
2014-08-21 10:43:22 -04:00
David Friedman
40c7d1971e ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f

Former-commit-id: b053e1e2ce [formerly 78ee5a56c5] [formerly b053e1e2ce [formerly 78ee5a56c5] [formerly 6a7638ddae [formerly 7027ff533991251f64f2e5a0deb31e2945cdde5f]]]
Former-commit-id: 6a7638ddae
Former-commit-id: 95fbbdf730 [formerly 76d78ff72e]
Former-commit-id: 2ce533f866
2014-08-20 14:13:32 +00:00
Brian.Dyke
fede3b4eb2 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 3bba82c371 [formerly ef9ddd0f98] [formerly 3bba82c371 [formerly ef9ddd0f98] [formerly ca564e58ea [formerly 3c1db35ef591bfe9c5124ad9c4c801d6acbdb8f8]]]
Former-commit-id: ca564e58ea
Former-commit-id: 41e9db65a4 [formerly 5676e51dc3]
Former-commit-id: 012ed15b36
2014-08-18 13:17:13 -04:00
Brian.Dyke
3e914c01fc Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 2054d6f844 [formerly 9a212410b5] [formerly 2054d6f844 [formerly 9a212410b5] [formerly d82d58d38e [formerly 5c9880c3179bf376798bb5658aec3666bddd7d3e]]]
Former-commit-id: d82d58d38e
Former-commit-id: 1d297de174 [formerly 9b1b39f3be]
Former-commit-id: d96b05a86e
2014-08-18 11:47:38 -04:00
Brian.Dyke
5a7a28d562 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: f33e622e9d [formerly 0bdacc25f6] [formerly f33e622e9d [formerly 0bdacc25f6] [formerly 4d47e00887 [formerly 7a7e030bd70bb5bfee849750f1a8e1e4238ec0ee]]]
Former-commit-id: 4d47e00887
Former-commit-id: c6346336c0 [formerly 0e7c221bd7]
Former-commit-id: db0bc6ba12
2014-08-18 10:20:49 -04:00
Melissa Porricel
9404c0b585 ASM #15699 - Fix Grib decoder error
Change-Id: Ieabe763de544960f6e7bae0e2cf940eaa2493511

Former-commit-id: 9f20c63f97 [formerly 67e44f145a] [formerly 9f20c63f97 [formerly 67e44f145a] [formerly 7e78946ee0 [formerly e8c156d166cedc1553f9ffd8867633651443872d]]]
Former-commit-id: 7e78946ee0
Former-commit-id: 248205a78f [formerly 356d0e04f6]
Former-commit-id: e76123c79a
2014-08-15 13:41:53 -04:00
Brian.Dyke
fbaf15c8f8 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: a73c8d4cda [formerly 8b1b457310] [formerly a73c8d4cda [formerly 8b1b457310] [formerly d3888b16f3 [formerly bdfe1c263b8bcc0f6ebc8fd31c506e76271319ea]]]
Former-commit-id: d3888b16f3
Former-commit-id: d0985451d7 [formerly 89941d5ca9]
Former-commit-id: 627583a000
2014-08-15 11:52:35 -04:00
Michael Gamazaychikov
65daa0f117 ASM #15701 WarnGen displaying error for Watch Wording when switching from backup site to local site
Change-Id: I9ff834f0b3717d046f278b8a21ca955e5f5c4805

Former-commit-id: 2b450af136 [formerly 9897417235] [formerly 2b450af136 [formerly 9897417235] [formerly c14a5287ac [formerly 126ec43423a864df597bd6dd745671ee0bf4fbfb]]]
Former-commit-id: c14a5287ac
Former-commit-id: ab21a0f8e9 [formerly 4097a7ddd0]
Former-commit-id: 2115121def
2014-08-15 11:03:23 -04:00
Steve Harris
564c6e20ea Merge branch 'master_14.2.2' (14.2.2-26) into omaha_14.2.2
Former-commit-id: f23139ba39 [formerly 1839d53d2c] [formerly f23139ba39 [formerly 1839d53d2c] [formerly b4ac2e9c2c [formerly c5d804b092e56082337b80f717c6b2f3307fd9be]]]
Former-commit-id: b4ac2e9c2c
Former-commit-id: 75963915c4 [formerly b2e8abd924]
Former-commit-id: 68f238ea5b
2014-08-13 14:50:49 -05:00
Ron Anderson
c19231f91a Issue #3517 Improved iscMosaic memory utilization and error handling when unzipping input file.
Change-Id: Idcce2dd53e39a8b483c2d5e244d4ec27bce94489

Former-commit-id: d39b184eea [formerly 10a5053981] [formerly d39b184eea [formerly 10a5053981] [formerly e4d1cfe9e5 [formerly 36d33879425d32b4ff7de617d511d7a2c51b6a4e]]]
Former-commit-id: e4d1cfe9e5
Former-commit-id: 3ab0b660ac [formerly ad0d4d27e2]
Former-commit-id: b3752cd3b2
2014-08-13 09:03:48 -05:00
Brian.Dyke
10510022f3 Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 63f000f11d [formerly 59183249ed] [formerly 63f000f11d [formerly 59183249ed] [formerly aefe154e51 [formerly 84fc55492f7eccf55d3bf8e7e3227c882286a8fb]]]
Former-commit-id: aefe154e51
Former-commit-id: ba4ddf9ceb [formerly 6043825b4c]
Former-commit-id: 7164c95a12
2014-08-12 13:24:35 -04:00
Richard Peter
e59ee6e8c4 Issue #3458 Update ldm-6.11.5 queue size
Change-Id: I6e434d31c9f39c896630b685ee9d86e81cc32afb

Former-commit-id: 635393cfb5 [formerly a9f8b72b6f] [formerly 635393cfb5 [formerly a9f8b72b6f] [formerly 7317d99519 [formerly c717d54c05cdae71b050eeee6afb06e6c71753a8]]]
Former-commit-id: 7317d99519
Former-commit-id: 17be38c6f8 [formerly 45b822c7cf]
Former-commit-id: f8cfa2ed28
2014-08-11 11:54:59 -05:00
Brian.Dyke
6aaec52bb2 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: c532d924ee [formerly d5177787c6] [formerly c532d924ee [formerly d5177787c6] [formerly 54808cc027 [formerly 6c54705000e153a9c17465631149a26aaf5f8c67]]]
Former-commit-id: 54808cc027
Former-commit-id: b58885d191 [formerly 0cacdb9fc0]
Former-commit-id: d3cd0ca28a
2014-08-08 11:31:24 -04:00
Bryan Kowal
0a3fcc0c91 Issue #3470 - the wrapperCapture script is now packaged in the awips2-edex and awips2-qpid-java-broker rpms. additional
log4j jar is now included in the awips2-qpid-java-common rpm. Fixed AbstractScript import error.

Change-Id: I7acfdff45944b8d9dd2f75e85cca3cc6d54b1903

Former-commit-id: 09442217cd [formerly a9b4b4124a] [formerly 09442217cd [formerly a9b4b4124a] [formerly b568c25e10 [formerly d11649deb78aa356f27a22f33b38f7238513576c]]]
Former-commit-id: b568c25e10
Former-commit-id: b0c94a2d61 [formerly 1d6eb95f9f]
Former-commit-id: 25fd6f379f
2014-08-07 16:27:46 -05:00
Richard Peter
83c71feeff Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
Former-commit-id: fc6aae3c3c [formerly 477119b739] [formerly fc6aae3c3c [formerly 477119b739] [formerly 96a1821753 [formerly e537db61848adeea0cef18e6a769597d746d6620]]]
Former-commit-id: 96a1821753
Former-commit-id: bc7d8bfe6d [formerly f7e0a6cf11]
Former-commit-id: fd18b7a134
2014-08-07 14:01:54 -05:00
Richard Peter
6ab1a7d511 Merge "Issue #3493 Grouped common VTECs together" into omaha_14.2.2
Former-commit-id: 83eae94f7b [formerly cefae5e9bd] [formerly 83eae94f7b [formerly cefae5e9bd] [formerly 76b2d682ab [formerly 90a8191245d599077ea7d42de2ee80f074a7397a]]]
Former-commit-id: 76b2d682ab
Former-commit-id: dea20dcc8a [formerly bb51150bc9]
Former-commit-id: f8b524dbaf
2014-08-07 09:21:55 -05:00
Jonathan Sanchez
1693c4cef5 Issue #3493 Grouped common VTECs together
Change-Id: Ia72150a4782e95ea075f42979c489f7ef5d69fb9

Former-commit-id: 46c3625f0c [formerly 0302efdc77] [formerly 46c3625f0c [formerly 0302efdc77] [formerly 31c3135496 [formerly 47de8da4cadd899ae9aa0ffe6c89a109491966bc]]]
Former-commit-id: 31c3135496
Former-commit-id: a2dce9ca73 [formerly f5abf465e2]
Former-commit-id: 88f1984064
2014-08-06 17:40:44 -05:00
Bryan Kowal
ab26a99200 Issue #3470 - finished TODO in yajsw ShellScript.java
Former-commit-id: dd7ae1f7d3 [formerly dd00d2fe38] [formerly dd7ae1f7d3 [formerly dd00d2fe38] [formerly 3b080e7c36 [formerly 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514]]]
Former-commit-id: 3b080e7c36
Former-commit-id: e1e6244b57 [formerly 8576c55443]
Former-commit-id: 12be1442f1
2014-08-06 16:34:35 -05:00
Ron Anderson
08296eaf7b Merge "Issue #3498 Provide upgrade scripts for Topo file name in D2D procedures and saved displays" into omaha_14.2.2
Former-commit-id: d38ab4f344 [formerly 6e25166972] [formerly d38ab4f344 [formerly 6e25166972] [formerly a1ea3eb3bc [formerly 1ed1ff3aabd3d3a4835591940fc70647147667f6]]]
Former-commit-id: a1ea3eb3bc
Former-commit-id: c403b06b55 [formerly 1d0b1e0aa2]
Former-commit-id: c750c5a37f
2014-08-06 16:14:00 -05:00
Ron Anderson
54ba19d631 Issue #3498 Provide upgrade scripts for Topo file name in D2D procedures and saved displays
Change-Id: I2b4577c972c884af08d59d7815017806928efa69

Former-commit-id: 0654b75fb2 [formerly cd72d75216] [formerly 0654b75fb2 [formerly cd72d75216] [formerly d3728fc462 [formerly bb204013345db535d7cf9ca103cb033cf2507def]]]
Former-commit-id: d3728fc462
Former-commit-id: 5f8529b844 [formerly 0fddd4e268]
Former-commit-id: ae4107adac
2014-08-06 14:00:47 -05:00
Ron Anderson
e75c785df6 Merge "Issue #3458 Increase ldm to edexBridge shared memory queue." into omaha_14.2.2
Former-commit-id: a93ba59bd1 [formerly 5aa1d7b692] [formerly a93ba59bd1 [formerly 5aa1d7b692] [formerly 214ec8cfa5 [formerly 1db29b26474545b85445ca4f0d5da75ff77f88c4]]]
Former-commit-id: 214ec8cfa5
Former-commit-id: 89aa442f9e [formerly 6cecfcd9dc]
Former-commit-id: 421a706c36
2014-08-06 12:06:32 -05:00
Richard Peter
24f06e6666 Issue #3458 Increase ldm to edexBridge shared memory queue.
Change-Id: I30f0db8b3802c13048587067fbf901c5a7903468

Former-commit-id: 01692edc6b [formerly bd2d97dc46] [formerly 01692edc6b [formerly bd2d97dc46] [formerly 8374869379 [formerly 21a63b7e1218efedab86d6034dd5b92810764cb9]]]
Former-commit-id: 8374869379
Former-commit-id: fbb7094b60 [formerly e155de7bbc]
Former-commit-id: 4e7687d442
2014-08-06 10:57:31 -05:00
Jonathan Sanchez
e6d9ff7359 Issue #3493 Allowed multiple watches to be displayed.
Change-Id: I8c69a07a5162868bc2a179960c7beb07d350cde9

Former-commit-id: a07674c864 [formerly 2946dc1904] [formerly a07674c864 [formerly 2946dc1904] [formerly 27d0e8eb52 [formerly e06ba2d33f9969ee3dc87491ac6bfa3e9ccb40b8]]]
Former-commit-id: 27d0e8eb52
Former-commit-id: bdd8f5682c [formerly 488b036a18]
Former-commit-id: 84a171eb7f
2014-08-05 12:23:16 -05:00
steve.naples
bbb977e8d5 ASM #15671 Fix PostShef to allow ingest with token set load_shef_ingest and ingestfilter not populated.
Change-Id: I55d8718f9bc50c9b0ce070e8a11cf09b3b4ff0fb

Former-commit-id: f5f348d681 [formerly 8185a7cd54] [formerly f5f348d681 [formerly 8185a7cd54] [formerly 0bb82e215e [formerly ed6769c047b8b21782da9a6040f2601465c150a2]]]
Former-commit-id: 0bb82e215e
Former-commit-id: 6563cdd3c1 [formerly 41e857da36]
Former-commit-id: d808a79ccf
2014-08-05 16:43:53 +00:00
Brian Clements
c78058dda1 Issue #3488 added bin range check to bin lightning decoder
Change-Id: Ib445da1a33c84283bc8dd46521b6f7c3381a51f9

Former-commit-id: ba934c5411 [formerly 8d928ab3a2] [formerly ba934c5411 [formerly 8d928ab3a2] [formerly 432f43b567 [formerly 53b274aab9952d372221c686d886ac12e8eb2e6a]]]
Former-commit-id: 432f43b567
Former-commit-id: 0455c90820 [formerly 61592f0e5a]
Former-commit-id: 19303c8b9f
2014-08-04 14:54:13 -05:00
Brian Clements
7f921c7c3d Issue #3488 added sanity check for bin range in lightning viz resource
Change-Id: I23ec1614821dcbc18c06f58e3ef00371988fc30a

Former-commit-id: dfc3545bf5 [formerly 7b312ab6a7] [formerly dfc3545bf5 [formerly 7b312ab6a7] [formerly 30ca12aae7 [formerly 701b56ec37053654e64cfd6ea831aad4ea7b9d8a]]]
Former-commit-id: 30ca12aae7
Former-commit-id: dd00eeb0ab [formerly 140bf429b9]
Former-commit-id: 6961892b9d
2014-08-04 11:22:12 -05:00
Juliya Dynina
d20ab7db34 Merge "ASM #15665 - Improve SatResource.java logging" into asm_14.2.2
Former-commit-id: 08c503140e [formerly 072104e2d7] [formerly 08c503140e [formerly 072104e2d7] [formerly 9e2124dd23 [formerly 98b85b738d099d8e2cc811aace8d6e6d913e45e9]]]
Former-commit-id: 9e2124dd23
Former-commit-id: 95ea71c3d8 [formerly 00cbc0892c]
Former-commit-id: d1c8c7cae2
2014-07-31 13:59:38 -05:00
Brian.Dyke
50b9351f33 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 5aa3d09885 [formerly 355a163270] [formerly 5aa3d09885 [formerly 355a163270] [formerly c3b7baf8a4 [formerly 2db7f14b353a5b23a38949a572d70bc12e5e5d0d]]]
Former-commit-id: c3b7baf8a4
Former-commit-id: aebcb01d90 [formerly 0d653cf04c]
Former-commit-id: 85bfcced95
2014-07-31 13:09:52 -04:00
Melissa Porricel
c3dabfacb0 ASM #15665 - Improve SatResource.java logging
Change-Id: Ibd0b246c36fe5547378a0a92793361ecc659cb1d

Former-commit-id: 8ac4827751 [formerly e31865ae4f] [formerly 8ac4827751 [formerly e31865ae4f] [formerly b59c3ee811 [formerly 5e369a7626987fbad409d25b7bcf3820c6268592]]]
Former-commit-id: b59c3ee811
Former-commit-id: 6fa5575f14 [formerly 7b4255bf2f]
Former-commit-id: faaf0c206c
2014-07-31 11:36:49 -04:00
Kiran.Shrestha
b13496cdbf ASM #97 - Freezing Level Height AGL for all models has units of dam instead of feet
Change-Id: Ia3d0709a6d3f8ea8d321218159faca7347df91fa

Former-commit-id: dd77c50f33 [formerly fbee424af7] [formerly dd77c50f33 [formerly fbee424af7] [formerly e650909e28 [formerly 24418dba4df50f5e46dd54302835e17db1576fe7]]]
Former-commit-id: e650909e28
Former-commit-id: bec9dcc014 [formerly 4a45669f4e]
Former-commit-id: b82ab79e86
2014-07-31 10:51:50 -04:00
Brian.Dyke
29bc56c37f Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: eeca2f2ec8 [formerly 3598f7b549] [formerly eeca2f2ec8 [formerly 3598f7b549] [formerly 905728d2fb [formerly 96ff2234e0d8893695b33a79d24a026a1a409073]]]
Former-commit-id: 905728d2fb
Former-commit-id: 370b180653 [formerly e3745633a3]
Former-commit-id: f5030dfeb5
2014-07-31 09:56:21 -04:00
Shawn.Hooper
53daf4e3bc ASM #15627 Revert "ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products."
This reverts commit 9732ea69398c323fee2b61570bfc18ab595da709 [formerly 8cffe955a9] [formerly e24dd6958e [formerly ba4c386f30] [formerly e24dd6958e [formerly ba4c386f30] [formerly 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]]].

Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2

Former-commit-id: 27f50397aa [formerly 976c7b2d4a] [formerly 27f50397aa [formerly 976c7b2d4a] [formerly 4e322737ce [formerly d272d426f8bd218954a75a7b2e19d21b30f975cb]]]
Former-commit-id: 4e322737ce
Former-commit-id: af19d9f9c4 [formerly fe0fffe51b]
Former-commit-id: 17ac974932
2014-07-30 14:03:51 -04:00
Juliya Dynina
e044393934 Merge "ASM #15648 Change to Cities.xml" into asm_14.2.2
Former-commit-id: 92e7f244fc [formerly fc27de56d2] [formerly 92e7f244fc [formerly fc27de56d2] [formerly 37587144c0 [formerly 264920b8af1b2665b17c1015afe02e6f4a719419]]]
Former-commit-id: 37587144c0
Former-commit-id: 984ca28f1b [formerly 6cf910a1e7]
Former-commit-id: 4d19f304ed
2014-07-30 07:48:43 -05:00
Daniel.Huffman
11de63b4f0 ASM #15648 Change to Cities.xml
Change-Id: Idc89484cf45fcd1fb30538119d254ed9c0fd79e2

Former-commit-id: 008255ad0e [formerly aca63e248f] [formerly 008255ad0e [formerly aca63e248f] [formerly ea11c48008 [formerly 1e2b8582fa4dec428b70a2e8aaa1e401ddbfcee7]]]
Former-commit-id: ea11c48008
Former-commit-id: cf2df78596 [formerly e9986b7316]
Former-commit-id: e9f98275bd
2014-07-29 21:41:00 +00:00
Kiran.Shrestha
fa984fd8a4 ASM #97 - Freezing Level Height AGL for all models has units of dam instead of feet
Change-Id: Ib92fbb1c153a8a4739371d8148673a5e32ea36f9

Former-commit-id: e9a417f5f8 [formerly a044b44c8b] [formerly e9a417f5f8 [formerly a044b44c8b] [formerly 11bab40785 [formerly 1730a6dea78cfd922b59c6cccc1c6f44d3a56949]]]
Former-commit-id: 11bab40785
Former-commit-id: fe32fc419a [formerly d32c2739cf]
Former-commit-id: 2c2ad03ee5
2014-07-28 16:18:39 -04:00
Michael Gamazaychikov
cc3172ead3 ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products.
Change-Id: Ic5689db7714be086d6e4543602db33a07e5b2fc1

Former-commit-id: e24dd6958e [formerly ba4c386f30] [formerly e24dd6958e [formerly ba4c386f30] [formerly 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]]
Former-commit-id: 8cffe955a9
Former-commit-id: f186b49e92 [formerly bb7b43be49]
Former-commit-id: 134b1286fc
2014-07-28 15:12:10 -04:00
Qinglu.Lin
000daa2716 ASM #15554 - Improve speed/efficiency of WarngenLayer.populateStrings
Change-Id: I6a3b9823ac7c23ba171206708187ab3fc3c7c1ca

Former-commit-id: f69a06238b [formerly 1eca5ef51a] [formerly f69a06238b [formerly 1eca5ef51a] [formerly 2aa16c114a [formerly 3b971d52a82099142fe08986df879a379dfa6314]]]
Former-commit-id: 2aa16c114a
Former-commit-id: 28842008ec [formerly 80c41d8904]
Former-commit-id: b3b4c058aa
2014-07-28 12:36:07 -04:00
Rici.Yu
53691c3cd3 ASM #15655 - Negate raising exception for empty db from IFPDB()
Change-Id: I5c96d654f3080a4b0f10113648f290a0d09961cb

Former-commit-id: a75c0c2f15 [formerly 9a1310d1ac] [formerly a75c0c2f15 [formerly 9a1310d1ac] [formerly 661737fb39 [formerly 9af51efbef229984de09a5ad338885d54f720270]]]
Former-commit-id: 661737fb39
Former-commit-id: bacd423e0e [formerly 60116edbcc]
Former-commit-id: af5d129375
2014-07-28 11:30:49 -04:00
Ron Anderson
e9b0d50ee9 Issue #3423 Move alarm/alert product requests off UI thread
Change-Id: I44149b5af54fbeac75231d6caeb3929fbf6ecf5e

Former-commit-id: ac0799ce35 [formerly 17b681f355] [formerly ac0799ce35 [formerly 17b681f355] [formerly 174d8b59e0 [formerly c3401cee78edae8dea6d21736fac25bfed996fb3]]]
Former-commit-id: 174d8b59e0
Former-commit-id: 3da914cf97 [formerly 64ba8b1c1a]
Former-commit-id: 243decf322
2014-07-24 14:02:10 -05:00
Steve Harris
58ac517c57 Merge branch 'master_14.2.2' (14.2.2-22) into omaha_14.2.2
Former-commit-id: 943a8270d8 [formerly a14b996684] [formerly 943a8270d8 [formerly a14b996684] [formerly 7d90ae4468 [formerly 6a7f00f07d1ee3e9f39b299306083228eb5adb18]]]
Former-commit-id: 7d90ae4468
Former-commit-id: da07f657f8 [formerly 05e49db6b5]
Former-commit-id: bb68ca550a
2014-07-24 11:35:24 -05:00
Brian.Dyke
3b1020701c Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: cd099c0902 [formerly cef9771fe1] [formerly cd099c0902 [formerly cef9771fe1] [formerly 3d6c40b341 [formerly 69c55eff70bbfb445bdd9bf708ed5e4df896b42a]]]
Former-commit-id: 3d6c40b341
Former-commit-id: 3f9cbad089 [formerly 5eebb40e76]
Former-commit-id: a6ac0d4696
2014-07-24 09:03:57 -04:00
Brian.Dyke
2a2b44393c Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 80ebce9354 [formerly ff4e52fc75] [formerly 80ebce9354 [formerly ff4e52fc75] [formerly 6f47712e32 [formerly df900c3156da1ed48c512fe4b1356c4b4301ad5f]]]
Former-commit-id: 6f47712e32
Former-commit-id: 402ad0ffc1 [formerly bdd5b3b00b]
Former-commit-id: 4f6fb953dd
2014-07-23 16:46:09 -04:00
Matthew Howard
f5a398e6bb Merge "ASM #15645 - Fix for AvnFPS: TAF syntax check fails when equal sign is missing" into asm_14.2.2
Former-commit-id: fecf7f3777 [formerly 6aa8d2102e] [formerly fecf7f3777 [formerly 6aa8d2102e] [formerly 06e7733a1d [formerly b7a12394c70b928222d3aa5e819d1558f4033458]]]
Former-commit-id: 06e7733a1d
Former-commit-id: 6440151765 [formerly 9bddb86c8d]
Former-commit-id: 783cbd4b66
2014-07-23 15:12:14 -05:00
Zhidong.Hao
2a4ea1243c ASM #15645 - Fix for AvnFPS: TAF syntax check fails when equal sign is missing
Change-Id: I1a4fb9be1253b4655bd43674aab4a4ddcf6d0ce7

Former-commit-id: d7cce22d02 [formerly 26c4bb2414] [formerly d7cce22d02 [formerly 26c4bb2414] [formerly a3cda853cf [formerly 192948e00538bcf0dfc0aaf20ea1dcb216313ffb]]]
Former-commit-id: a3cda853cf
Former-commit-id: ee2f893d21 [formerly eef5191d1c]
Former-commit-id: 350028e069
2014-07-23 14:37:28 -04:00
Steve Harris
a980faab73 Merge branch 'master_14.2.2' (14.2.2-21) into omaha_14.2.2
Former-commit-id: 619ed933ac [formerly eaa4456fa7] [formerly 619ed933ac [formerly eaa4456fa7] [formerly 35130cb3f5 [formerly 2c17b02a196584edbaa2cef33d8e9adc91567f8e]]]
Former-commit-id: 35130cb3f5
Former-commit-id: ab6fad008f [formerly 0da15f729e]
Former-commit-id: 9b3af6a2dd
2014-07-23 13:07:11 -05:00
Matthew Howard
51539416f9 Merge "ASM #15649 - these 5 files are rolled back to 14.1.3" into asm_14.2.2
Former-commit-id: 4cf9cc1178 [formerly b84f1255f0] [formerly 4cf9cc1178 [formerly b84f1255f0] [formerly 621be56dbc [formerly 75a9fd67f7093fe2f8eb21cec6762210a3014351]]]
Former-commit-id: 621be56dbc
Former-commit-id: b573787ff7 [formerly 278937eb11]
Former-commit-id: ecb5fcae31
2014-07-23 11:17:38 -05:00
Ying-Lian.Shi
a1c024e575 ASM #15649 - these 5 files are rolled back to 14.1.3
Change-Id: Ifc52168f1faf3984f2a2d72947273686c5a00fd9

Former-commit-id: 9dbfbbe0c3 [formerly 22d46f2658] [formerly 9dbfbbe0c3 [formerly 22d46f2658] [formerly 1f6d24a076 [formerly ab5a6807a591605e230d4180f1dcf3c2eaa8657f]]]
Former-commit-id: 1f6d24a076
Former-commit-id: ef8ec0cff0 [formerly c571da3e89]
Former-commit-id: a0b7830856
2014-07-23 12:24:22 +00:00
Jonathan Sanchez
e4268f814e Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1

Former-commit-id: 997485dd22 [formerly 86a8ca4a30] [formerly 997485dd22 [formerly 86a8ca4a30] [formerly b991838494 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]]]
Former-commit-id: b991838494
Former-commit-id: f7bc9a8023 [formerly 025c29acc0]
Former-commit-id: 56cbd23141
2014-07-22 15:32:12 -05:00
Shawn.Hooper
df3b41ed7d ASM #15630 - Check-in fix for GFE: Missing ISC Wind Grids on behalf of Ron Anderson
Change-Id: I9053182b6c02d6c77e10e23b017b94bcff4da58b

Former-commit-id: a70786ff22 [formerly 2a32d5945c] [formerly a70786ff22 [formerly 2a32d5945c] [formerly ae272328a3 [formerly 4bca3ffd258a6869150154e93abb652a1f22bc4d]]]
Former-commit-id: ae272328a3
Former-commit-id: 4171066d84 [formerly 94e01820a2]
Former-commit-id: 141996f0ab
2014-07-22 15:59:22 -04:00
Steve Harris
3b5fc91579 Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 7b0b043c67 [formerly bce7039508] [formerly 7b0b043c67 [formerly bce7039508] [formerly 8a7ea92c2b [formerly c0033681d38af55bff79efbceec119606fcc5c2f]]]
Former-commit-id: 8a7ea92c2b
Former-commit-id: 7a4111b29f [formerly 0314663e95]
Former-commit-id: e24b5a2fec
2014-07-22 10:26:33 -05:00