Commit graph

6289 commits

Author SHA1 Message Date
Brian.Dyke
170dd119bd Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 43ecc95cb9 [formerly cb92ade16f] [formerly 41e3037133] [formerly 43ecc95cb9 [formerly cb92ade16f] [formerly 41e3037133] [formerly e6ac4980b9 [formerly 41e3037133 [formerly b0fef17ac648ed5d13d6125fa600c915b131147d]]]]
Former-commit-id: e6ac4980b9
Former-commit-id: 840bca2edd [formerly 64fb434c9a] [formerly 047945540310783288fda381c73f597a6cb18c3a [formerly 75e90d1117]]
Former-commit-id: 182ff9272bf1aef74c86d753b92d2fa40948da52 [formerly b16e50a929]
Former-commit-id: ffe2894555
2014-10-15 13:55:32 -04:00
Juliya Dynina
95892247df Merge "ASM #16844 - WarnGen can become disabled when moving storm track" into asm_14.3.1
Former-commit-id: 517a158c00 [formerly bc1c9b692d] [formerly 9825175171] [formerly 517a158c00 [formerly bc1c9b692d] [formerly 9825175171] [formerly 1421171def [formerly 9825175171 [formerly 64318d29379dc904be07fa6bc1d38a51642e0476]]]]
Former-commit-id: 1421171def
Former-commit-id: 854dd89ed0 [formerly 6397265083] [formerly c376dd17d727029a0c539f56010fcab5feac8c43 [formerly f7222baf88]]
Former-commit-id: 83345def82eb844b470710654560023f6c39afaa [formerly 27984f606d]
Former-commit-id: f72afc9a7b
2014-10-14 07:10:10 -05:00
Juliya Dynina
f3d6f064b9 Merge "ASM #258 - cross section - switching the log plot to z-coordinate scale" into asm_14.3.1
Former-commit-id: 7cdf797188 [formerly 6beb107913] [formerly 33e30cab01] [formerly 7cdf797188 [formerly 6beb107913] [formerly 33e30cab01] [formerly 32b7e80d82 [formerly 33e30cab01 [formerly 5a639cc5850b906df927db1069bcf60cd68f15ab]]]]
Former-commit-id: 32b7e80d82
Former-commit-id: 17f3b8e28d [formerly 4e51d7f201] [formerly 8f45e7a0933ece071b87017dcba16aa4ebde8c8a [formerly 0f4094974d]]
Former-commit-id: 76445243aa836858f71b7835e459bfd6967e78ac [formerly 0aecd81e26]
Former-commit-id: 012760bad2
2014-10-10 14:43:13 -05:00
David Friedman
10e53eb90f ASM #16844 - WarnGen can become disabled when moving storm track
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a

Former-commit-id: b8556f48c4 [formerly 455f1ad7aa] [formerly 955809450d] [formerly b8556f48c4 [formerly 455f1ad7aa] [formerly 955809450d] [formerly 68f985d668 [formerly 955809450d [formerly f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2]]]]
Former-commit-id: 68f985d668
Former-commit-id: 2013b9427c [formerly 3f1ed65033] [formerly a9b3aa62a2f496643fd9046866f2e1b1496d8361 [formerly 7176b476a2]]
Former-commit-id: 7829e63f06d462f7116d3888d02d99561229d005 [formerly f325e4ad55]
Former-commit-id: 65eaac9743
2014-10-10 19:33:21 +00:00
Brian.Dyke
9d5f5f4fa9 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 9d33c64bd2 [formerly a1de83a7a8] [formerly 862712a00f] [formerly 9d33c64bd2 [formerly a1de83a7a8] [formerly 862712a00f] [formerly 05e4e92e65 [formerly 862712a00f [formerly 4b2f00f3baeb6715ff76beb823978605742bc13d]]]]
Former-commit-id: 05e4e92e65
Former-commit-id: 13d4df30d8 [formerly c6a319c099] [formerly 0bc5f4a45d659f9cff64552d81e2736ab9d99de5 [formerly 748007cad1]]
Former-commit-id: 441d5fd9b8bb3e686f2b58d131c012e1a6414fef [formerly d618dac32b]
Former-commit-id: 901e7649d2
2014-10-10 13:17:54 -04:00
Shawn.Hooper
880c3ae6a8 ASM #13467 - GFE: Need to add Beach Hazards Statement
Change-Id: Icd52e8f1cd05f1f1ecd0b43458593e95496e0db6

Former-commit-id: 328b9f9d42 [formerly bfa9eb0dea] [formerly cea5061c61] [formerly 328b9f9d42 [formerly bfa9eb0dea] [formerly cea5061c61] [formerly 0c61661989 [formerly cea5061c61 [formerly 457c467d7437c5550bb8727e813d8aa9d9c338a9]]]]
Former-commit-id: 0c61661989
Former-commit-id: 3d985d75c4 [formerly 26c4187518] [formerly d7720efb9dc6f1a55837cf5028979a97b5edb77a [formerly c2acd70bc5]]
Former-commit-id: b0fcfbc2ec5df7c636cf408ac7fd0f7ec7bed678 [formerly 7d9fe08ca9]
Former-commit-id: aad1970cf0
2014-10-10 13:14:25 -04:00
Brian.Dyke
03f65ca414 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 2e6f3e057a [formerly 797a9c6c10] [formerly f85eb2d0ac] [formerly 2e6f3e057a [formerly 797a9c6c10] [formerly f85eb2d0ac] [formerly 6ae3795b7c [formerly f85eb2d0ac [formerly 344f436cfabfa5c1d0aa552467be7a6f9656a1ec]]]]
Former-commit-id: 6ae3795b7c
Former-commit-id: 4962750f7e [formerly 6034909d2d] [formerly b9b756a1fb303b55472d87a26e19fc89a60a9ac7 [formerly 36571c8238]]
Former-commit-id: 4dee77ada5e45267109cee2b90e6dc3c62342602 [formerly 969b40b517]
Former-commit-id: fdfc95c5ff
2014-10-10 11:01:01 -04:00
David Friedman
02c73d42a9 ASM #258 - cross section - switching the log plot to z-coordinate scale
Change-Id: Ie2fd21c0b65d17f778d69daf7120e47a6f4e552a

Former-commit-id: 49de7df204 [formerly 676ee09f11] [formerly 40f7e8df44] [formerly 49de7df204 [formerly 676ee09f11] [formerly 40f7e8df44] [formerly ad73a90b53 [formerly 40f7e8df44 [formerly f187f262a28e0ee9df2b75eff7d1f5382a729ac3]]]]
Former-commit-id: ad73a90b53
Former-commit-id: 3c1214c181 [formerly a90bb5d7df] [formerly 59aeb56d48b0065f1e48d06285d425bc6c2704e3 [formerly 96a5bd13cc]]
Former-commit-id: 10bd28ba9c0c9940ecfb83228723a469670d7e62 [formerly 487c6d9b66]
Former-commit-id: 13e46506b8
2014-10-10 14:18:54 +00:00
Juliya Dynina
8abc55bc9f Merge "ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM" into asm_14.3.1
Former-commit-id: ac23208143 [formerly 1fb3bdb8a1] [formerly 240917cf96] [formerly ac23208143 [formerly 1fb3bdb8a1] [formerly 240917cf96] [formerly 4911f61f10 [formerly 240917cf96 [formerly 7a0da7440a3e5e1696cc676dc3405d2aaa95252b]]]]
Former-commit-id: 4911f61f10
Former-commit-id: f8aa6982c0 [formerly 3504f48099] [formerly efd33dc8b8fa524b22424059231330c4f74de20d [formerly 404d6667fb]]
Former-commit-id: 3830b2a0fc8f8a8ebddaa16502bbc981624423c5 [formerly 09ebdd8a25]
Former-commit-id: d85ac13c86
2014-10-08 12:00:39 -05:00
Sean Webb
c07a095741 Merge "ASM #15672 - fixed script to allow for full path of input file to be passed" into asm_14.3.1
Former-commit-id: b8ef7759e0 [formerly c90be3ba42] [formerly c3f3140c4f] [formerly b8ef7759e0 [formerly c90be3ba42] [formerly c3f3140c4f] [formerly 01b52daea2 [formerly c3f3140c4f [formerly 986a78cef3d8814e04035b00545a289171c7cc8a]]]]
Former-commit-id: 01b52daea2
Former-commit-id: cf7ca768ce [formerly 8fa1b81841] [formerly 2f00b95c997eee25ced2231beef462f774845262 [formerly e72d2cdc73]]
Former-commit-id: 11adcc4c5f13bb5bc594502622dc5d91565994b4 [formerly 4659b14c23]
Former-commit-id: 89720ee6a6
2014-10-07 14:04:58 -05:00
Kevin.Johnson
b807315c70 ASM #15672 - fixed script to allow for full path of input file to be passed
Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae

Former-commit-id: 80696f6c01 [formerly dcecf025a2] [formerly 355274e7ac] [formerly 80696f6c01 [formerly dcecf025a2] [formerly 355274e7ac] [formerly 5cf5cac9f7 [formerly 355274e7ac [formerly 0982ab6536679921a6afdc85166fe57e92aeac63]]]]
Former-commit-id: 5cf5cac9f7
Former-commit-id: 6d3d9b8525 [formerly 617128a462] [formerly 7c82d46d775b400020deae7632d2575b46368bec [formerly b0e68c1ed1]]
Former-commit-id: 473a100cbd2e94850b8eb2472fe951036cd16586 [formerly 6698928cff]
Former-commit-id: 99b25084ee
2014-10-07 14:55:41 -04:00
Nate Jensen
94f99ada47 Merge "Issue #3686 fix kml export when maps are the only thing loaded" into omaha_14.3.1
Former-commit-id: 31f3bb414f [formerly 9c95c255c2] [formerly ef6da2a181] [formerly 31f3bb414f [formerly 9c95c255c2] [formerly ef6da2a181] [formerly b2dcfdf572 [formerly ef6da2a181 [formerly 03ed17c8994b00ea37c1c591760c9b7c452dfcde]]]]
Former-commit-id: b2dcfdf572
Former-commit-id: 66a1c74989 [formerly 3caa2b3a21] [formerly 95af3f6b0b6efaecfa4c81a4a2a352015c7af4ed [formerly 58c8b04318]]
Former-commit-id: 3264102321c0ee2360649a60b79682d788af067e [formerly 41729296aa]
Former-commit-id: 2bb8579c76
2014-10-06 15:53:19 -05:00
Nate Jensen
f55b993e2b Issue #3686 fix kml export when maps are the only thing loaded
Change-Id: I4741da935b0ef24bd8d0d0d114151404038828a0

Former-commit-id: 1a4569eaef [formerly f8278a9ad3] [formerly 446e0bcdf6] [formerly 1a4569eaef [formerly f8278a9ad3] [formerly 446e0bcdf6] [formerly 9025e166dd [formerly 446e0bcdf6 [formerly 9dac0fcf997feeecdd8c581ae8fd72581c32d095]]]]
Former-commit-id: 9025e166dd
Former-commit-id: 7b982b0833 [formerly 06d562092d] [formerly be3094a4b7146ccbb7a91092d58b8513482d6d19 [formerly 00adad9546]]
Former-commit-id: 0b8665364577af24ca355547bb5dd0507d2c317f [formerly 7d4f951822]
Former-commit-id: 3c4e7bc755
2014-10-06 15:41:42 -05:00
Qinglu.Lin
7a28775d46 ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I2a64416b861d3b374538db8efad51a9509a87892

Former-commit-id: b11f115e03 [formerly 8372c15a61] [formerly 636f054077] [formerly b11f115e03 [formerly 8372c15a61] [formerly 636f054077] [formerly 47be3aa143 [formerly 636f054077 [formerly 7124fd252f130417a9dcdac148480058d6eb0aba]]]]
Former-commit-id: 47be3aa143
Former-commit-id: d3faf3d51b [formerly 58948e5e7c] [formerly f099750bb0ad8f4c9c2e838374d8c90b4d978031 [formerly 4589f2e183]]
Former-commit-id: 529d3675be2f3a43a2dc538afeaa913254d6327e [formerly 0ea296f865]
Former-commit-id: 0c89c85435
2014-10-06 16:05:26 -04:00
Michael Gamazaychikov
12b346f811 ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410

Former-commit-id: 74c03e5b81 [formerly 3851e4c961] [formerly f0b644d92e] [formerly 74c03e5b81 [formerly 3851e4c961] [formerly f0b644d92e] [formerly e6d3baaa9c [formerly f0b644d92e [formerly dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463]]]]
Former-commit-id: e6d3baaa9c
Former-commit-id: c338697738 [formerly a2c89ea11c] [formerly 7008af67fcd8171a0d155c064f558b3a2f7043fe [formerly 4613f0e9d1]]
Former-commit-id: e8740668a7325fb0966a81adfd4a9857c2f48201 [formerly 63f3558f48]
Former-commit-id: 488cf033a9
2014-10-06 15:32:10 -04:00
Brian.Dyke
d8ccd40588 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 5da2026d2b [formerly 85d83aefe0] [formerly f440da9c70] [formerly 5da2026d2b [formerly 85d83aefe0] [formerly f440da9c70] [formerly 92762f46c7 [formerly f440da9c70 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]]]
Former-commit-id: 92762f46c7
Former-commit-id: beb7a3f448 [formerly 64aef1a783] [formerly 6e5ec5380fe3992e157472559b5e85f288b4b251 [formerly 4dbdf9de26]]
Former-commit-id: d771453098f05cdadd94113c1504ef71db5e8e6b [formerly 91f89ee1f6]
Former-commit-id: 918de34464
2014-10-03 14:04:46 -04:00
Brian.Dyke
9308ab8537 Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 7390f6c3a8 [formerly db665d3876] [formerly 2a911984f0] [formerly 7390f6c3a8 [formerly db665d3876] [formerly 2a911984f0] [formerly 20dd249d2c [formerly 2a911984f0 [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]]]]
Former-commit-id: 20dd249d2c
Former-commit-id: 8f0310e3be [formerly 46956a01c6] [formerly b67eecdaf5931ae1d938fb48bd33e3327dd7a473 [formerly 72ea2fbe48]]
Former-commit-id: 1353c554161d3298ae22ce357602c081830d7584 [formerly a3ccdd9704]
Former-commit-id: 572bbdd019
2014-10-02 10:44:50 -04:00
Brian.Dyke
2b3ced91f5 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 06f6dfc38a [formerly 006bdb00ad] [formerly 65ad6056b6] [formerly 06f6dfc38a [formerly 006bdb00ad] [formerly 65ad6056b6] [formerly f3f95aabb0 [formerly 65ad6056b6 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]]
Former-commit-id: f3f95aabb0
Former-commit-id: 452a3f046b [formerly d174db3b0c] [formerly c24910662181554debcd898acc9cf5ec28027cf0 [formerly e77f1e126e]]
Former-commit-id: 2c9750edd9ade43fd7db7e61b4503a53d6f26781 [formerly 1d2dfd264a]
Former-commit-id: e100894074
2014-10-02 10:38:51 -04:00
Brian.Dyke
18c69d87e2 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: d1c62c3542 [formerly d4888adc0f] [formerly f47840e4d9] [formerly d1c62c3542 [formerly d4888adc0f] [formerly f47840e4d9] [formerly 2ac30f6c22 [formerly f47840e4d9 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]]]
Former-commit-id: 2ac30f6c22
Former-commit-id: 75ac4f1971 [formerly 277b6e4b36] [formerly 93329339083b58eea30cf9a2fd0c9efc1645f3bb [formerly 36d377e08d]]
Former-commit-id: 99779fb5c1561694dd3f154813fbc624081344ca [formerly 7e465baead]
Former-commit-id: c853463f73
2014-10-02 10:24:04 -04:00
Brian.Dyke
06b277ddad Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 65ff0876ac [formerly 31f073ee3a] [formerly 4bc465bfbd] [formerly 65ff0876ac [formerly 31f073ee3a] [formerly 4bc465bfbd] [formerly 97464ea153 [formerly 4bc465bfbd [formerly f26e54011d334972bb1e999304b1b2d13a1c408f]]]]
Former-commit-id: 97464ea153
Former-commit-id: 6fb0b9db12 [formerly 0915cb28b0] [formerly e6df31f2ffcf43d1eb4e7ab7f3e4535088a2930f [formerly e76ee74410]]
Former-commit-id: 565e90f88a51d32a3dc74eded19ae3d9afe627ab [formerly 1d5c3fb6d4]
Former-commit-id: 0fa5e7da1a
2014-10-02 10:15:34 -04:00
Steve Harris
9af0816bb1 Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: 0a8b36918a [formerly 09d8955b31] [formerly e201e1a493] [formerly 0a8b36918a [formerly 09d8955b31] [formerly e201e1a493] [formerly cc34483b0b [formerly e201e1a493 [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]]]]
Former-commit-id: cc34483b0b
Former-commit-id: 1935bca883 [formerly 8a627b9bf6] [formerly 624efa7bb6f054750278a0da16282ffd685e50b6 [formerly d711c1b67b]]
Former-commit-id: d7fad664b2074d5ba2b2d769ee3502435babad47 [formerly 074e12da64]
Former-commit-id: 18d68410e5
2014-10-02 08:09:02 -05:00
Shawn.Hooper
31e8a0ce78 ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720

Former-commit-id: 5254c781ef [formerly 22c3fde0ef] [formerly f9428ace1f] [formerly 5254c781ef [formerly 22c3fde0ef] [formerly f9428ace1f] [formerly ae02cbc2da [formerly f9428ace1f [formerly ea8e4c3a30bceb2f3b53159317382ae651aa5531]]]]
Former-commit-id: ae02cbc2da
Former-commit-id: 822bf53765 [formerly 9ecf241616] [formerly 327e246075a5678f3f87a2f176ae5a099cda1f84 [formerly f2d7288970]]
Former-commit-id: b565ebbaf4b308868a0989d66bf53b79c61b72e6 [formerly e5b5160a51]
Former-commit-id: 5a228f5a5c
2014-10-01 15:58:48 -04:00
Brian.Dyke
64b52f6e95 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 64529eea01 [formerly 0be927be2d] [formerly 5ed17c0e24] [formerly 64529eea01 [formerly 0be927be2d] [formerly 5ed17c0e24] [formerly a4bfbea3c2 [formerly 5ed17c0e24 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]]]]
Former-commit-id: a4bfbea3c2
Former-commit-id: f180f63136 [formerly 4df4eb9c2b] [formerly a57615d594bf6386e1ca03920b1004483f28976a [formerly 914da168c8]]
Former-commit-id: af85c1c0498d395eb57281594d2bd53c3aeec77f [formerly 8184df119d]
Former-commit-id: ea401b327b
2014-10-01 15:36:06 -04:00
Nate Jensen
56dd0566f7 Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15

Former-commit-id: 1a4b7cc454 [formerly fce7d5899f] [formerly 482af416b3] [formerly 1a4b7cc454 [formerly fce7d5899f] [formerly 482af416b3] [formerly f2633a56c0 [formerly 482af416b3 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]]]]
Former-commit-id: f2633a56c0
Former-commit-id: f0362a03d4 [formerly f7a075907c] [formerly 2a2d868056e74cb4e29f291cba399ffd3f99c3fc [formerly 18acca9ef8]]
Former-commit-id: bc2c3efd4b7820055c54a4ed22e533c68dff148b [formerly b5998c975b]
Former-commit-id: d4b7693f81
2014-10-01 11:53:40 -05:00
dmsys
6b2eccce36 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 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/core/internal/IFPClient.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm

Former-commit-id: 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]]
Former-commit-id: 9f4560c480
Former-commit-id: 0cb584f44e [formerly 07f84c6b26] [formerly 674f011faa89a8d6263043b42cfc79d80e3b82b4 [formerly b884e5e32d]]
Former-commit-id: 8f7a656cd223aa4bbbad7217939da98d6e8672ab [formerly e00ea2d8cd]
Former-commit-id: 71d6e48473
2014-09-30 13:45:54 -04:00
Nate Jensen
7c60d22c70 Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1
Former-commit-id: 1b08756d5c [formerly 6d382220a3] [formerly 057e5eda1a] [formerly 1b08756d5c [formerly 6d382220a3] [formerly 057e5eda1a] [formerly 510d26050d [formerly 057e5eda1a [formerly 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083]]]]
Former-commit-id: 510d26050d
Former-commit-id: 9a5d59439a [formerly aa526b5dfd] [formerly 42e79970c3fdd6d0b0e8fb734c22677388f48746 [formerly a79d34801b]]
Former-commit-id: 8155626ac26143b96fcd6110ab76d9d781526da8 [formerly eaaacc67c6]
Former-commit-id: 3f983b9fa4
2014-09-29 17:50:34 -05:00
Ben Steffensmeier
51d14fe247 Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: ed401f7250 [formerly b333960362] [formerly c573db2918] [formerly ed401f7250 [formerly b333960362] [formerly c573db2918] [formerly 95b096192b [formerly c573db2918 [formerly e93157375f90c6cc2038db9a78346592e4d46b0e]]]]
Former-commit-id: 95b096192b
Former-commit-id: 33ac3fa012 [formerly 923ead3167] [formerly b5b30fb554ce5a1662f9e0a71423cb921b5a5de4 [formerly 3c55b8166c]]
Former-commit-id: 44ec49710bc32dea4a3a15c9fafa5ec79198f50b [formerly dc7966cdec]
Former-commit-id: 41b2311008
2014-09-29 11:20:33 -05:00
Steve Harris
51dc2a3cc0 Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: 73f0f5b364 [formerly fdfe16985d] [formerly 46da726675] [formerly 73f0f5b364 [formerly fdfe16985d] [formerly 46da726675] [formerly c03bc273da [formerly 46da726675 [formerly 49ad8e0e780443a0439227694a92ec8ab683b125]]]]
Former-commit-id: c03bc273da
Former-commit-id: 5258758f00 [formerly dd92661aba] [formerly e9d263d5e3d4ae86f04bc281e88f66ef7053628d [formerly 7c37aaa92e]]
Former-commit-id: 349ffbd052c9aafa425b36741904040d25416ad7 [formerly af7f1cf232]
Former-commit-id: d19a7675a9
2014-09-29 11:14:32 -05:00
Brian.Dyke
ade65cb1ab Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: b89a2459ee [formerly 9661a1d7b1] [formerly 0c1b83b644] [formerly b89a2459ee [formerly 9661a1d7b1] [formerly 0c1b83b644] [formerly 0e0255ce5b [formerly 0c1b83b644 [formerly 6e79993fbf34ebd832ca07356cbac003efaf6405]]]]
Former-commit-id: 0e0255ce5b
Former-commit-id: 1cc416b17b [formerly 3b3e81d4a2] [formerly e1d7c0bc2a75cdb11de7602ec3d70def4a84dc95 [formerly 77e8985bdd]]
Former-commit-id: b95dc8cf8203e0355bb74fbd1477f87572b22689 [formerly 7bcee86aa2]
Former-commit-id: 5a3c7d3510
2014-09-29 11:55:16 -04:00
Sean.Webb
e51a34bbf4 Merge "ASM #16720 - Added pushd and cd prior to patch extraction" into asm_14.2.4
Former-commit-id: 691367ac10 [formerly c679d1cc46] [formerly fbd892909b] [formerly 691367ac10 [formerly c679d1cc46] [formerly fbd892909b] [formerly 2d531d73fd [formerly fbd892909b [formerly c62a7e14e82c7274ed1868d73446aab895901546]]]]
Former-commit-id: 2d531d73fd
Former-commit-id: 1a43a17087 [formerly 8a2e8285c1] [formerly e92970318142c2e4401b4da4a250bd311ac98d15 [formerly 1a70eea0e0]]
Former-commit-id: ae8fbb7e955bc2332a71a148a9680706d9258e93 [formerly fac3e1fee0]
Former-commit-id: 14883994b6
2014-09-29 10:35:10 -05:00
Brian.Dyke
ab1f21c096 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: fac7a6aaa1 [formerly fce029653d] [formerly 0a497fc015] [formerly fac7a6aaa1 [formerly fce029653d] [formerly 0a497fc015] [formerly 46af1d0857 [formerly 0a497fc015 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]]]
Former-commit-id: 46af1d0857
Former-commit-id: ad3338e07f [formerly 886c1b7e3d] [formerly 9fc151f40941f9cab99d6eb050662408c5746324 [formerly 85676ff532]]
Former-commit-id: 0acefdbae8bda17deeb120ade9ca40a2e782cfaa [formerly 4d5f7db303]
Former-commit-id: 23450210b1
2014-09-29 11:20:57 -04:00
Sean.Webb
9d0e79bb1d ASM #16720 - Added pushd and cd prior to patch extraction
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225

Former-commit-id: d3df1699db [formerly 224cddfe9b] [formerly 02e187a609] [formerly d3df1699db [formerly 224cddfe9b] [formerly 02e187a609] [formerly 600b75bd9f [formerly 02e187a609 [formerly c2af0284e9146dff8431ecd4f6ce88437ea83d9f]]]]
Former-commit-id: 600b75bd9f
Former-commit-id: 9c5957ef9f [formerly 1538817a38] [formerly f41e6444ab2ff3f5348a13f52e0f8be3af16c39c [formerly 293f860e93]]
Former-commit-id: e39674a87d4139148f14864f620545df8022ec71 [formerly f80a90d69f]
Former-commit-id: e45ec5cac9
2014-09-29 10:24:04 -04:00
Sean.Webb
af55511cf1 Merge "ASM #16720 - Removed extraneous popd which was changing dir when not needed" into asm_14.2.4
Former-commit-id: 801886c053 [formerly 9b25583e3a] [formerly dc3ad9863d] [formerly 801886c053 [formerly 9b25583e3a] [formerly dc3ad9863d] [formerly 6e1f0363c8 [formerly dc3ad9863d [formerly 8f44d89f1d11cd587106f7eda3edec93802f5cf3]]]]
Former-commit-id: 6e1f0363c8
Former-commit-id: 14b79aea22 [formerly 7eebdb1a1f] [formerly 91443454a619ad861f2b04ace401454530344121 [formerly 323adcd30c]]
Former-commit-id: 52234a660887c55810ea7468ff70e8a1a509710b [formerly 2cdd576f9e]
Former-commit-id: 104f95697e
2014-09-29 08:31:44 -05:00
Sean.Webb
89aa38db4a ASM #16720 - Removed extraneous popd which was changing dir when not needed
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683

Former-commit-id: 86382f5396 [formerly 6840d55343] [formerly 0738a41cbf] [formerly 86382f5396 [formerly 6840d55343] [formerly 0738a41cbf] [formerly 78f83fa594 [formerly 0738a41cbf [formerly 4faea9724adf17d0bec7f013bafc7f8dd2f7499e]]]]
Former-commit-id: 78f83fa594
Former-commit-id: 88580b8666 [formerly d70bc9fd9f] [formerly 7d13704772f862b4d8ca1264bf50de7ba0cbcd2d [formerly 197908686e]]
Former-commit-id: 079aaf5290e12bd890cc6e5d9fb1b9599c781840 [formerly c69f833921]
Former-commit-id: b7bae10212
2014-09-29 08:21:00 -04:00
Brian.Dyke
61e0794afa Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 008769daef [formerly 8e459ec500] [formerly 550ffba7b0] [formerly 008769daef [formerly 8e459ec500] [formerly 550ffba7b0] [formerly 142432ba5e [formerly 550ffba7b0 [formerly 93ddf672c137c7221e9595e8b5c1b279084cb451]]]]
Former-commit-id: 142432ba5e
Former-commit-id: 2933a8feb6 [formerly 5da730103f] [formerly c6128f8c799ccef707e6c3fff938b928bef40d43 [formerly 63e3d61ff5]]
Former-commit-id: c291b04ca8130a58761f4f6824329e24c5bdae85 [formerly de0dc96df8]
Former-commit-id: ab28cb0583
2014-09-26 16:14:06 -04:00
David Friedman
ed3bed65d4 ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2

Former-commit-id: ea894ca5fc [formerly 86100b6ca8] [formerly 6791e8d885] [formerly ea894ca5fc [formerly 86100b6ca8] [formerly 6791e8d885] [formerly 05707d0f20 [formerly 6791e8d885 [formerly 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb]]]]
Former-commit-id: 05707d0f20
Former-commit-id: 39608cef87 [formerly 78f7f0fc88] [formerly e4217632693bc1a8536646a8fa63f65c055822c6 [formerly b3bd3a9d7f]]
Former-commit-id: c1bf57bee47fd5a37681a17e8a8301df05b879d9 [formerly 1204c0d666]
Former-commit-id: cd643396d6
2014-09-26 20:05:46 +00:00
Brian.Dyke
81c73398bd Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: cf09c46335 [formerly 858cfa1078] [formerly 41921f7db2] [formerly cf09c46335 [formerly 858cfa1078] [formerly 41921f7db2] [formerly 814b9a2869 [formerly 41921f7db2 [formerly 60756ddb841a0daa347493047b76d2fcb93f7f4a]]]]
Former-commit-id: 814b9a2869
Former-commit-id: e4ea2693fd [formerly ee0c04ae93] [formerly 4c6b04163013250a17875ac3df684e189a90b847 [formerly a2b18e4bee]]
Former-commit-id: 7f93c819b12c5c538f65f20f09a3c964e5acf685 [formerly 7f406eb3b6]
Former-commit-id: ef96354985
2014-09-26 15:15:57 -04:00
Brian.Dyke
fe76a3b906 Merge branch 'asm_14.2.4' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.4
Former-commit-id: bef2315cae [formerly 2495e16947] [formerly 989a9c5835] [formerly bef2315cae [formerly 2495e16947] [formerly 989a9c5835] [formerly f1755fb7ae [formerly 989a9c5835 [formerly 4ff65f7c83042dd40b5c2bf37ee54d12315c5714]]]]
Former-commit-id: f1755fb7ae
Former-commit-id: 7ab092b63b [formerly fecebad9b6] [formerly 5868c05818b1b78d884526cd0699e5a085fb6507 [formerly 8c2c886675]]
Former-commit-id: 0f16753f3100ca5a5d7c71e3245891fc79d99c1d [formerly 081fffae8e]
Former-commit-id: 7791acd7d4
2014-09-26 14:20:34 -04:00
Brian.Dyke
d81096c5ca Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 698273b551 [formerly 396f9755dc] [formerly 1ac61fb612] [formerly 698273b551 [formerly 396f9755dc] [formerly 1ac61fb612] [formerly f26fe97ec4 [formerly 1ac61fb612 [formerly 5b570e5229628de88068edee1c70c26eec13f71a]]]]
Former-commit-id: f26fe97ec4
Former-commit-id: 19bd990683 [formerly f6af0dd0df] [formerly 2c9cf5cc04ae60ed33371ee6fa605e762929a4a0 [formerly 33525968e3]]
Former-commit-id: 2fb1e2bc67ea5f2cb68c1b79a31dc29d8cfb3cb8 [formerly 4359e8dc47]
Former-commit-id: b481c3f064
2014-09-26 14:19:03 -04:00
Brian.Dyke
d07c8dfefb Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 67a9c88d27 [formerly f520ff97b6] [formerly 8245370186] [formerly 67a9c88d27 [formerly f520ff97b6] [formerly 8245370186] [formerly a4f68caac6 [formerly 8245370186 [formerly 6ed90023551e25216c10d05f2568593992326900]]]]
Former-commit-id: a4f68caac6
Former-commit-id: 062dbe5bb9 [formerly 328edcaebf] [formerly 781fbb9e9a10fef8b099386a964b7a41bc80831b [formerly 34a073a848]]
Former-commit-id: 6a13079a74ca3b525400419cdecb2b0ed33c775b [formerly 554cb1a84d]
Former-commit-id: ccbb922254
2014-09-26 13:02:49 -04:00
Sean.Webb
386758b569 Merge "ASM #16720 - Added updated palt.c to fix seq num in pqact pattern" into asm_14.2.4
Former-commit-id: 7102ba66c9 [formerly e8585c9d29] [formerly 96503843d9] [formerly 7102ba66c9 [formerly e8585c9d29] [formerly 96503843d9] [formerly 57342f0256 [formerly 96503843d9 [formerly d1ce11d690a1acf24fe82fc10acc83302e8f61f9]]]]
Former-commit-id: 57342f0256
Former-commit-id: 9e31a55d4a [formerly b18f341781] [formerly bd0f319fec2822e2062a65928b3c551cdcf7c13e [formerly d43119b40f]]
Former-commit-id: 8c7847477f956dce4a910702ba5588e2895b8314 [formerly feb73e67c5]
Former-commit-id: 18214a3d55
2014-09-26 11:01:04 -05:00
Brian.Dyke
b22b8a7e7e Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 3b71fe393a [formerly 0045c3100f] [formerly 586a504500] [formerly 3b71fe393a [formerly 0045c3100f] [formerly 586a504500] [formerly bd983e1932 [formerly 586a504500 [formerly d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7]]]]
Former-commit-id: bd983e1932
Former-commit-id: 8c9dab9e0d [formerly 30f8b55a19] [formerly 9542d4e85f18f0b367f543c554364189920d2e5c [formerly 95d80abd56]]
Former-commit-id: 9be16538ca3909938b2e8889eb9c1163b5ec910a [formerly 295e2814f7]
Former-commit-id: 7f65a5b799
2014-09-26 11:47:38 -04:00
David Friedman
9bda6e748f ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae

Former-commit-id: 52788dc473 [formerly 1737d16a5c] [formerly 33aee54b8f] [formerly 52788dc473 [formerly 1737d16a5c] [formerly 33aee54b8f] [formerly db29ec9dec [formerly 33aee54b8f [formerly c8aa2fbfc35c872e2d50de2212eaf16db9b5483d]]]]
Former-commit-id: db29ec9dec
Former-commit-id: 3a4b64b244 [formerly f207169057] [formerly 98df6f24bb854efcf38b4d519a69b4cfb6549f6a [formerly bda6e42529]]
Former-commit-id: c67aaf513adc787fca00ecbf1b8b3865e61359b3 [formerly a740acaedf]
Former-commit-id: 140950a966
2014-09-26 15:13:56 +00:00
Sean.Webb
6f25dd644f ASM #16720 - Added updated palt.c to fix seq num in pqact pattern
Change-Id: I08d858beeae7f0fb211a3cf287b7763aa2cff9b5

Former-commit-id: b186a8e714 [formerly eb959d100a] [formerly 628ab54d68] [formerly b186a8e714 [formerly eb959d100a] [formerly 628ab54d68] [formerly 7d75d994c1 [formerly 628ab54d68 [formerly d59054c870fee17076aec22cd683ef1586a153da]]]]
Former-commit-id: 7d75d994c1
Former-commit-id: b8d4676a9d [formerly 9b63e571a7] [formerly d1d9f82966b42c43a0e84a2a3cb4b7703be092c9 [formerly 039619264f]]
Former-commit-id: fe4b07e604c1f035cc4a768f1adcaba533724766 [formerly 16b034a9e1]
Former-commit-id: dfdd922054
2014-09-26 10:49:37 -04:00
David Friedman
2ccc61d974 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03

Former-commit-id: e186ecc15f [formerly cfcfc17a2b] [formerly 41820f112f] [formerly e186ecc15f [formerly cfcfc17a2b] [formerly 41820f112f] [formerly c85b0d1cfd [formerly 41820f112f [formerly 70b520c08670646047ffa753814f98c032938ff8]]]]
Former-commit-id: c85b0d1cfd
Former-commit-id: aa44cc223f [formerly 7f9fdcb74b] [formerly 85fb0295278cf649fceb869b36e00a9b5838cced [formerly f6d3a80dbf]]
Former-commit-id: 89bc5587a18c450923f919a65eb6b7c148de99d5 [formerly d1160ea2ca]
Former-commit-id: a45e6dfdcf
2014-09-26 13:07:28 +00:00
David Friedman
5731b7be45 ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028

Former-commit-id: 15956c0d58 [formerly c16f5c2e7c] [formerly 5755c120d5] [formerly 15956c0d58 [formerly c16f5c2e7c] [formerly 5755c120d5] [formerly e82f96193e [formerly 5755c120d5 [formerly 117c2f072b647e353456832f2f0088d51a660d65]]]]
Former-commit-id: e82f96193e
Former-commit-id: 38b1f21829 [formerly 214002e207] [formerly 3dbc33db262d9bada00bd433cc886c15d5c7e52e [formerly 07befd1cce]]
Former-commit-id: dea055fed7e293d338ce1c20c31a4130f4243601 [formerly 4aa2667d1f]
Former-commit-id: 73b0da212a
2014-09-25 22:10:42 +00:00
David Friedman
30ee562dc7 ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0

Former-commit-id: d8618f1419 [formerly 973d0b9a55] [formerly b3025aacb0] [formerly d8618f1419 [formerly 973d0b9a55] [formerly b3025aacb0] [formerly 8ab4649312 [formerly b3025aacb0 [formerly 5048af915b004067ec8a6e788a0e9ad3e006c9d8]]]]
Former-commit-id: 8ab4649312
Former-commit-id: d017509506 [formerly a10060f45d] [formerly 78ef0251563c92144b5b39f6944eb8273d2bbaee [formerly c19d9ee755]]
Former-commit-id: 6265764de67efa983a3247d8e0f688518aca6844 [formerly f6a6032d61]
Former-commit-id: 0a94f1ccfb
2014-09-25 21:07:16 +00:00
Shawn.Hooper
7375498ea1 ASM #600 - WarnGen: template optional watch inclusion
Change-Id: I282e94236389a907326926a68e2ed810a00b9688

Former-commit-id: 645452e694 [formerly 56cd6483ef] [formerly da77322fd0] [formerly 645452e694 [formerly 56cd6483ef] [formerly da77322fd0] [formerly 831af82c23 [formerly da77322fd0 [formerly 04bd69f437b897d63ac78d6cbd7c60451366cc6d]]]]
Former-commit-id: 831af82c23
Former-commit-id: 69936c2e30 [formerly b7b38c3c7b] [formerly 817965418b0c842b1ad5da3208584a36816ae7cf [formerly a242e1c43b]]
Former-commit-id: a5b12de9821ce311b31c13d5c12513c54acf06dc [formerly 3d098f947d]
Former-commit-id: 8f6e82acd9
2014-09-25 16:25:43 -04:00
Qinglu.Lin
a54643cb55 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5

Former-commit-id: 66aa148879 [formerly 1c55b5c400] [formerly 94fed71091] [formerly 66aa148879 [formerly 1c55b5c400] [formerly 94fed71091] [formerly ef851d0016 [formerly 94fed71091 [formerly 8b194664458246dad7509c44bcc07480cb088ddd]]]]
Former-commit-id: ef851d0016
Former-commit-id: d17c5c4cea [formerly 94e636a862] [formerly d474e64298e43533fc8fae332206a5876ea17ca1 [formerly 3e1d8d83a9]]
Former-commit-id: 66190dcbfae8433d1114faa1702550156ed8f5da [formerly c3be043b3a]
Former-commit-id: 73c0213b36
2014-09-25 15:16:42 -04:00
Matthew Howard
4b1c050bb8 Merge "ASM #16693 updated dictionary cleanup script" into asm_14.3.1
Former-commit-id: ddaca9e61d [formerly 8ec2860888] [formerly 7d93a588f4] [formerly ddaca9e61d [formerly 8ec2860888] [formerly 7d93a588f4] [formerly 63a7fb0372 [formerly 7d93a588f4 [formerly bc9c9b073e69825d5e040e1cca2f738719a7e4f7]]]]
Former-commit-id: 63a7fb0372
Former-commit-id: 7d1eaa2b01 [formerly 1468a50f53] [formerly 88f2756459f974869a116341bc17bc0227e85949 [formerly fc2d6cd5f5]]
Former-commit-id: f9e49e7ffe32f586c57ef4675b3b1ceaa39dabf4 [formerly 0af667fd17]
Former-commit-id: 15764461ad
2014-09-25 14:14:40 -05:00