Ben Steffensmeier
|
b5ab1f8eac
|
Issue #3923 Fix thin client grid updates.
Former-commit-id: fa11934170 [formerly 147b6c3733] [formerly 67701a2480] [formerly fa11934170 [formerly 147b6c3733] [formerly 67701a2480] [formerly dcea13e602 [formerly 67701a2480 [formerly 537534fb920a8ea109d9bc655f16579cdb357dda]]]]
Former-commit-id: dcea13e602
Former-commit-id: e9f61f6b13 [formerly 918bdad0f4] [formerly 25cbde3b79d123c25e9ccf8664cc1d78cd7d29da [formerly b9dfe6a44e]]
Former-commit-id: b89e7c6a47927a440344448e662a9a69f501c069 [formerly 97a7386f66]
Former-commit-id: deff57c9f8
|
2014-12-15 13:25:43 -06:00 |
|
Lee Venable
|
8e028cca9b
|
Merge "Issue #3026 - Fixed the HPE bias query" into omaha_14.3.1
Former-commit-id: 8db69312d9 [formerly 9ab36f2594] [formerly 190565855d] [formerly 8db69312d9 [formerly 9ab36f2594] [formerly 190565855d] [formerly 4d212f1d09 [formerly 190565855d [formerly 51e1e12ff98b2f1270b0fbd43bd169c6adae6d76]]]]
Former-commit-id: 4d212f1d09
Former-commit-id: fbd10e5cb3 [formerly e38470685c] [formerly 337784d9c342ced3b0a5294992c69c7416d8db4e [formerly b80e0e567b]]
Former-commit-id: 7ebdc4204b7922a5b960051d7713c1bbf7aff975 [formerly 469a4c339b]
Former-commit-id: 48213e83e5
|
2014-12-12 13:53:21 -06:00 |
|
Mike Duff
|
cd544c53a9
|
Issue #3026 - Fixed the HPE bias query
Former-commit-id: 4aa2893c92 [formerly 1f8b9191ea] [formerly f02b462933] [formerly 4aa2893c92 [formerly 1f8b9191ea] [formerly f02b462933] [formerly 508cf4c1d5 [formerly f02b462933 [formerly f2d5395fe522e61edd5768f37b530299a197dd07]]]]
Former-commit-id: 508cf4c1d5
Former-commit-id: 228c3917f9 [formerly 543dfd8900] [formerly 68dfb18146f7924e7b89540807b8aba77bc4e698 [formerly 507da3ca8b]]
Former-commit-id: 4e411c3f3b5a55bfcad3a68f66fb4981cee864f3 [formerly 2aaa6cfe76]
Former-commit-id: c6dc8775ed
|
2014-12-12 11:16:15 -06:00 |
|
Dave Hladky
|
16367d9714
|
Issue #3891 Special overlap handling for promotion of sub from site to shared
Change-Id: Ifa8f4be3e9e0f172ee54c5ef7021b912d45c5de2
Former-commit-id: 4b7557498f [formerly e897cb40df] [formerly d81e3b0efa] [formerly 4b7557498f [formerly e897cb40df] [formerly d81e3b0efa] [formerly 8796705c6b [formerly d81e3b0efa [formerly 9a31befafe66a677b744fa9ae9ef7e134a758bd9]]]]
Former-commit-id: 8796705c6b
Former-commit-id: 3b279c5c46 [formerly c57d63dbc5] [formerly 95be4db4f3feed3848fe1af3c5e26e5143c88aa2 [formerly 072c6223ef]]
Former-commit-id: 3ef73265f70d1dfad04feff94e49ab210fdba1fc [formerly 475e40f58f]
Former-commit-id: ea9a8900f0
|
2014-12-08 14:36:44 -06:00 |
|
Steve Harris
|
5eedde5382
|
Merge branch 'master_14.3.1' (14.3.1-36) into omaha_14.3.1
Former-commit-id: cc9614e0c7 [formerly b9081f0c0c] [formerly b19ae7a6db] [formerly cc9614e0c7 [formerly b9081f0c0c] [formerly b19ae7a6db] [formerly 12d20a1e6b [formerly b19ae7a6db [formerly e2a6deed98773f943def0ce9d9daf2a6a13f0eda]]]]
Former-commit-id: 12d20a1e6b
Former-commit-id: 227b2898f7 [formerly 059b34ff5c] [formerly ecffc2e03becbcfb10c9ee3e396bb35f58f82a19 [formerly 5c1b170604]]
Former-commit-id: a0ca0541d7438772d02fefe7585ecde1b9b37731 [formerly 3d3de6d3e7]
Former-commit-id: de7570535c
|
2014-12-07 23:13:26 -06:00 |
|
Steve Harris
|
5a4f14cd83
|
Merge branch 'master_14.3.1' (14.3.1-35) into omaha_14.3.1
Former-commit-id: 976387008b [formerly 94c94fc302] [formerly 55e02e460f] [formerly 976387008b [formerly 94c94fc302] [formerly 55e02e460f] [formerly 6179b233a4 [formerly 55e02e460f [formerly 28f68f31cbb9b73910fc3623f48b141ba5ba2385]]]]
Former-commit-id: 6179b233a4
Former-commit-id: 8cb23fcecb [formerly c198f27397] [formerly 03db0116b175cefae787859e9854947709ff7312 [formerly 3626b87ba3]]
Former-commit-id: 2b3cf2a5d53daebd289d9bc425dd734ff53de333 [formerly f0096f6a97]
Former-commit-id: 0a8e281903
|
2014-12-03 16:03:42 -06:00 |
|
Juliya Dynina
|
77582d88ad
|
Merge "ASM #16889 - Fixed colorvalue_use warning and cleaned up some code." into asm_14.3.1
Former-commit-id: 96f5d1719e [formerly d49e57a971] [formerly c431691d06] [formerly 96f5d1719e [formerly d49e57a971] [formerly c431691d06] [formerly 354a421da7 [formerly c431691d06 [formerly 2ebcc016732b0405b183b0e4e56d528a24e9cbdf]]]]
Former-commit-id: 354a421da7
Former-commit-id: 62ac61dfae [formerly de28a15f08] [formerly 53eb1338d5c060484e927fdda9fcef6e866134e1 [formerly 3466788534]]
Former-commit-id: 7c9a74d062a6b9d7df48b6a6bc3f4b902a697c2b [formerly c4ba582ff4]
Former-commit-id: b605a89c50
|
2014-12-03 14:40:12 -05:00 |
|
steve.naples
|
f006f63c91
|
ASM #16889 - Fixed colorvalue_use warning and cleaned up some code.
Change-Id: Id9d52cdb328ed7f863f7e09c09ee3e7ef70bf8a4
Former-commit-id: a281a43536 [formerly 91c240f8bd] [formerly c4fad58bd9] [formerly a281a43536 [formerly 91c240f8bd] [formerly c4fad58bd9] [formerly b5389ced26 [formerly c4fad58bd9 [formerly 862cb7c4d789915067558c4508cf5f1e45a2cdf2]]]]
Former-commit-id: b5389ced26
Former-commit-id: 692e983e4e [formerly ffe6a3d92f] [formerly 09f2caf3ac82a9c20c3ad865e0df3e02fb8130d3 [formerly f33429b6f0]]
Former-commit-id: 2664818bffbc2a80dac3e8c1885de246e4af4fe8 [formerly 21f7cc1c0d]
Former-commit-id: 872c537dbe
|
2014-12-03 18:35:19 +00:00 |
|
Brian.Dyke
|
caa6cdee91
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 9e9eaa9eb2 [formerly 5c476c7a35] [formerly 6777dfad30] [formerly 9e9eaa9eb2 [formerly 5c476c7a35] [formerly 6777dfad30] [formerly 3b0a70d21e [formerly 6777dfad30 [formerly 5972d08bfe8bc836a3437251bcf9f5e68e14b6a1]]]]
Former-commit-id: 3b0a70d21e
Former-commit-id: 06c2affc59 [formerly 4a237f37b1] [formerly 24c0fbc1d20c30997847ccd331c01ddf0974ac16 [formerly e49d1b27b6]]
Former-commit-id: 245a7183202cbba4e44e85ab536952d977e7d3cd [formerly ff75ac2290]
Former-commit-id: cc516be6d9
|
2014-12-02 12:17:32 -05:00 |
|
Paul.Grell
|
25334eaecc
|
ASM #16911 HydroDate set to next day if hour is 18Z or later
Change-Id: Ied55660cb81e3fdf2e87295fe22eb0915f7b4764
Former-commit-id: a2baa66348 [formerly 2aecc9933d] [formerly 63ae1fe88c] [formerly a2baa66348 [formerly 2aecc9933d] [formerly 63ae1fe88c] [formerly 370466a7e8 [formerly 63ae1fe88c [formerly 38d9bc8c4e385e339df5bdd010160728730bed8d]]]]
Former-commit-id: 370466a7e8
Former-commit-id: 848653583b [formerly 5269897368] [formerly 32b2fdbaec4bcf2897cb477fc500263b5842c76a [formerly c6cec6b252]]
Former-commit-id: 9defeb88037b60b41116a50104dd12fd94edc922 [formerly 08f47bfadd]
Former-commit-id: a335d1383c
|
2014-12-02 11:35:28 -05:00 |
|
Greg Armendariz
|
f357eb52d9
|
Merge "Issue #3804 BigNsharp 32 Bit Binary DLL" into omaha_14.3.1
Former-commit-id: ac15389395 [formerly 90211f7199] [formerly 2b7718e838] [formerly ac15389395 [formerly 90211f7199] [formerly 2b7718e838] [formerly f8d3131a94 [formerly 2b7718e838 [formerly e2ca08db84093060c1b570d7ec0c6d95b37d958c]]]]
Former-commit-id: f8d3131a94
Former-commit-id: f74b4694c9 [formerly 8219f59c3f] [formerly 31f0b63de8476640d0314f459fdb3c4a58165c5c [formerly 638afce469]]
Former-commit-id: 20171eefce08a608c739e29b88b6bd6fed30d713 [formerly c0b6bdd172]
Former-commit-id: 406fe72cfb
|
2014-12-01 08:39:56 -06:00 |
|
David Lovely
|
fb2990336f
|
Issue #3804 BigNsharp 32 Bit Binary DLL
Former-commit-id: 4b6b382db2 [formerly 48f15f5168] [formerly 96d211ec20] [formerly 4b6b382db2 [formerly 48f15f5168] [formerly 96d211ec20] [formerly 7011dcd271 [formerly 96d211ec20 [formerly d4fe863a026c3df816d74ae724276628ab8aa4fb]]]]
Former-commit-id: 7011dcd271
Former-commit-id: 40fe87c07a [formerly 7881c0a30b] [formerly ffca37672fb2163e451592efd5df4f23b0829594 [formerly 06fdbc60d4]]
Former-commit-id: 10181d4c0dc6396ba5e98b5de0b291c228fbfb31 [formerly 7da92cb2c4]
Former-commit-id: 119b429498
|
2014-11-26 13:39:22 -06:00 |
|
steve.naples
|
264f3b6544
|
ASM #16889 - Daily QC does not display SNOTEL data.
Change-Id: I42035d5d4d856a395400a1be1d0c6a24bc64b0d8
Former-commit-id: 144c886fd0 [formerly 74aa7ae98b] [formerly ec656123f2] [formerly 144c886fd0 [formerly 74aa7ae98b] [formerly ec656123f2] [formerly a0face5b02 [formerly ec656123f2 [formerly 01735909fffdc9b5ef14ed072253eed6deaecad9]]]]
Former-commit-id: a0face5b02
Former-commit-id: e29591bce8 [formerly ffb601d560] [formerly 9a31d1b81c5e8a0af984499935600099c89e3c75 [formerly 5845c1d382]]
Former-commit-id: 8d5f62f4ad359895880dc1639272abc37fda6220 [formerly 98e2feaf8d]
Former-commit-id: 5b67fa0f7c
|
2014-11-26 18:24:53 +00:00 |
|
Nate Jensen
|
1c8aca37b2
|
Merge "Issue #3026 - Fix for HPE displays is volume browser" into omaha_14.3.1
Former-commit-id: 0c79204969 [formerly e4da2244f9] [formerly b46b4b51a8] [formerly 0c79204969 [formerly e4da2244f9] [formerly b46b4b51a8] [formerly 63c505f357 [formerly b46b4b51a8 [formerly 1cf731bc43346810f1976650ad509ee538cf3067]]]]
Former-commit-id: 63c505f357
Former-commit-id: 73f7d47480 [formerly e2f2a73ae3] [formerly 132989d7c373aac2ec0589d11445937cd2218a35 [formerly 102d0e7a29]]
Former-commit-id: 166e333ed40a152efa08ccafdedb93d4bde71b88 [formerly c99b5a5ae6]
Former-commit-id: cf303fb976
|
2014-11-21 15:46:16 -06:00 |
|
Mike Duff
|
7d90b1fe77
|
Issue #3026 - Fix for HPE displays is volume browser
Change-Id: I1ef2766e9bf74e7ad82cc36cd4e4a35659aacf39
Former-commit-id: d9db0d97de [formerly 3ab236aca3] [formerly 67f3b00beb] [formerly d9db0d97de [formerly 3ab236aca3] [formerly 67f3b00beb] [formerly c1bea3b41f [formerly 67f3b00beb [formerly a375e64e7ee3276be47b26f4386e7bc6491bc740]]]]
Former-commit-id: c1bea3b41f
Former-commit-id: bc38a5ea0e [formerly 04222b8e43] [formerly b66a6bc9b99f9dd148144516bd28c69494e633ce [formerly 3f0f42a7df]]
Former-commit-id: 972e1dce3406fd6304e64c79edf68c797be3062d [formerly aff7af3377]
Former-commit-id: fab77b664b
|
2014-11-21 13:56:46 -06:00 |
|
Roger Ferrel
|
7eed1054cc
|
Issue #3439 Changed id=gfs90 to id=gfs to avoid confusion in these xml files.
Change-Id: I55b44a25196e9dcbc0a5e1417da1c39e5b978f3e
Former-commit-id: 58019036d5 [formerly 4bcfb3ccaf] [formerly 4d06812d30] [formerly 58019036d5 [formerly 4bcfb3ccaf] [formerly 4d06812d30] [formerly 71db8afbaa [formerly 4d06812d30 [formerly a9ce685c99dbdc1442f022cda7af09af5bdabf87]]]]
Former-commit-id: 71db8afbaa
Former-commit-id: 65676609b4 [formerly 1a39fc8b9c] [formerly dafbbfa4ef0200bacdb899a8cf93fe9efc90d3c8 [formerly a188c5443b]]
Former-commit-id: b3e43b6216b763fd3506be07b141a941138e0c13 [formerly 77118778ae]
Former-commit-id: d310b78363
|
2014-11-20 12:25:00 -06:00 |
|
Roger Ferrel
|
b9cfeede1c
|
Issue #3439 Replaced GFS213 with GFS229.
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15
Former-commit-id: 18d467a6c7 [formerly 85d717b49c] [formerly 90a8b262f3] [formerly 18d467a6c7 [formerly 85d717b49c] [formerly 90a8b262f3] [formerly b88300a5fc [formerly 90a8b262f3 [formerly 6cb88075375e3703b5ffe559ebd5e4f57d016880]]]]
Former-commit-id: b88300a5fc
Former-commit-id: 7c6a09b6da [formerly b86d906a5a] [formerly 9574acdebff523891e8e57b567844ffb96eb1ad1 [formerly 83c738abd9]]
Former-commit-id: 3bc156fe1002cdc3db57c9146ae2e504cf3e0b4c [formerly 6e58de9ef0]
Former-commit-id: 4006dd2e2b
|
2014-11-18 17:42:39 -06:00 |
|
Mike Duff
|
89e18804a8
|
Issue #3026 - Fixed pattern to match the actual file names
Change-Id: I957e2076cfa5ee4d59acc1a0db89066e446bfc99
Former-commit-id: 7ca13e8c64 [formerly edb85525d0] [formerly 9be37bb41e] [formerly 7ca13e8c64 [formerly edb85525d0] [formerly 9be37bb41e] [formerly f841f1eda9 [formerly 9be37bb41e [formerly 5a3ccbadbf08957a4f68a0cb7118c765ca44f849]]]]
Former-commit-id: f841f1eda9
Former-commit-id: 50ed2fcfaa [formerly 1f1436a0da] [formerly 99dcb66ca05f3bc9190625751752e7d5d4a5fa80 [formerly f1c4463316]]
Former-commit-id: d6ca13b36829aba07cf66f57b83e41a1ae840846 [formerly f30552c6de]
Former-commit-id: 4116e82f67
|
2014-11-18 13:54:17 -06:00 |
|
Steve Harris
|
2005f52357
|
Merge branch 'master_14.3.1' (14.3.1-33) into omaha_14.3.1
Former-commit-id: f7d8458cff [formerly 9be298ac91] [formerly e8d5ccbc8c] [formerly f7d8458cff [formerly 9be298ac91] [formerly e8d5ccbc8c] [formerly 8372956276 [formerly e8d5ccbc8c [formerly 75097cfa26dbcff3adf0054a1f88d0d185f289fc]]]]
Former-commit-id: 8372956276
Former-commit-id: 0e49f98052 [formerly da8130d7be] [formerly b4757de105d152d339121fd63f28713fe6ad5cd6 [formerly a0908d3bb0]]
Former-commit-id: 7a29ad121f4be55e716c157c813338b6f4769389 [formerly aae0c2b4c5]
Former-commit-id: f26308e6e7
|
2014-11-17 13:46:28 -06:00 |
|
David Lovely
|
1f0824ba79
|
Issue #3804 BigNsharp Binary DLL
Change-Id: Iaed7d84aeee537d884aa89942b6d0f14bb0a119d
Former-commit-id: fbc8c87a3d [formerly 56536c7fa8] [formerly e8a2331f46] [formerly fbc8c87a3d [formerly 56536c7fa8] [formerly e8a2331f46] [formerly bfcc4cf523 [formerly e8a2331f46 [formerly 1e0d00304e70b89b9b2a9de96753aeebde32bb19]]]]
Former-commit-id: bfcc4cf523
Former-commit-id: fe8f72b6ee [formerly c84ae8ccc5] [formerly 5ae35b5521ebe88feff96256088de6c87c71f967 [formerly d45c3f310d]]
Former-commit-id: 98d7c7973282338c874b626f2b242143a505671b [formerly 1953ee8470]
Former-commit-id: 3b02c678d3
|
2014-11-17 12:40:13 -06:00 |
|
Fay.Liang
|
0e1b09f7c6
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 2ecd6d5cb2 [formerly 99f1259dda] [formerly 82f427924a] [formerly 2ecd6d5cb2 [formerly 99f1259dda] [formerly 82f427924a] [formerly d666aca2b4 [formerly 82f427924a [formerly 3b21d69375ceb9c07377082c5e46a094742406a0]]]]
Former-commit-id: d666aca2b4
Former-commit-id: 5c654fb013 [formerly 1d42c33173] [formerly 1acf8ac0d1e5ae410a3b6f7287d142b2e286923b [formerly 03a71aa13a]]
Former-commit-id: 788017db85586aedef37e86e509dea3966026cbb [formerly c2cf04d82c]
Former-commit-id: 69898f4fae
|
2014-11-14 16:24:25 -05:00 |
|
Lee Venable
|
7078011895
|
Merge "Issue #3026 - fixes to data access for HPE label generation" into omaha_14.3.1
Former-commit-id: b818070fad [formerly f18c963895] [formerly 6b127b488d] [formerly b818070fad [formerly f18c963895] [formerly 6b127b488d] [formerly f5bcc5b2c2 [formerly 6b127b488d [formerly 389c35bce7c456154321605c3415c43431a46c7b]]]]
Former-commit-id: f5bcc5b2c2
Former-commit-id: ae535cccf7 [formerly 630c2c7e7a] [formerly 756e6222f5b0b1c7efd8501ee035f89e77a2769a [formerly 3a05aecbd6]]
Former-commit-id: 364875a64046c1548faf6813af272dca284cc1df [formerly 29e2674ed5]
Former-commit-id: f9fdd8ac05
|
2014-11-13 09:31:57 -06:00 |
|
Mike Duff
|
62062548c0
|
Issue #3026 - fixes to data access for HPE label generation
Former-commit-id: 286339f229 [formerly b43c8557cd] [formerly 8503cc25a7] [formerly 286339f229 [formerly b43c8557cd] [formerly 8503cc25a7] [formerly 15f9d1ef50 [formerly 8503cc25a7 [formerly 8d30af1c970cca70fe74560d3157e754e1164785]]]]
Former-commit-id: 15f9d1ef50
Former-commit-id: c947854ff4 [formerly 9cec2bd0e6] [formerly fd0c2c0890833cd21f55eec7e94fd4ad309a0fa2 [formerly 4ede0f150c]]
Former-commit-id: 0393a53473570d23007928134014e02ec2072ced [formerly 04b7ae9256]
Former-commit-id: 5cc3280353
|
2014-11-12 18:34:32 -06:00 |
|
Ron Anderson
|
0345808dcf
|
Issue #2854 Fix merge issue in MessageProducer between DRs 2726 and 3684
Change-Id: I6a6ea9c57857459f61e955a54275a8983a8004ce
Former-commit-id: d88d5321e2 [formerly 755fdd1950] [formerly a60e3465f4] [formerly d88d5321e2 [formerly 755fdd1950] [formerly a60e3465f4] [formerly 654c831b4e [formerly a60e3465f4 [formerly 09f13d9b33cfe3547d2dc3fb75c1673e1f3193b0]]]]
Former-commit-id: 654c831b4e
Former-commit-id: 87c009d895 [formerly dac3e5320a] [formerly e0886f35226d38a7f69b2a4022cab9a12725a574 [formerly 47be7dc5a8]]
Former-commit-id: 2a522a7a435c3b88d0441f1b6148695ce2a9f28d [formerly 018fa61174]
Former-commit-id: 3f2d2840d2
|
2014-11-12 11:25:32 -06:00 |
|
Dave Hladky
|
7c8d6fc6dd
|
Issue #3026 Fixed null metaData lookups in resource.
Change-Id: I29d17ea990ac5516b67ac18fadf4267663a23efb
Former-commit-id: 02cba88d1a [formerly 019739d738] [formerly 3052a38081] [formerly 02cba88d1a [formerly 019739d738] [formerly 3052a38081] [formerly 39db26fb1d [formerly 3052a38081 [formerly 3f6bba1fda61fe283be47af1a4245d196f94f998]]]]
Former-commit-id: 39db26fb1d
Former-commit-id: cf99f70020 [formerly d58e10f006] [formerly 9caf66e7d3bf0e1f08a3d26da73cf675814cd89e [formerly 99e46fdc2c]]
Former-commit-id: 650e9621a3a41dccf35bb4303f1192441e964d40 [formerly 1e663936c6]
Former-commit-id: 1fd60a4db7
|
2014-11-11 10:18:47 -06:00 |
|
Brian.Dyke
|
cc26442644
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 36af744c81 [formerly 1cef274675] [formerly 3dff476497] [formerly 36af744c81 [formerly 1cef274675] [formerly 3dff476497] [formerly 7e87bf7ac4 [formerly 3dff476497 [formerly b683c7776ef1fad2702fca82aed1abb4873e433b]]]]
Former-commit-id: 7e87bf7ac4
Former-commit-id: 2ce0cefb51 [formerly 26e3e6af8a] [formerly d0f7bdffce2f99e6d3ab19461861abc1752090d9 [formerly 6d74ef5ad8]]
Former-commit-id: c1617712f769e0390e4f89b980bb8fafa30acb3d [formerly 93ea188c7c]
Former-commit-id: ce5813e8c3
|
2014-11-07 12:55:38 -05:00 |
|
Brian.Dyke
|
346b21fb94
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
Former-commit-id: bb6e90eb2e [formerly 43b6c9ff82] [formerly 1cd471ed72] [formerly bb6e90eb2e [formerly 43b6c9ff82] [formerly 1cd471ed72] [formerly 1e7d47d2aa [formerly 1cd471ed72 [formerly b9d6c75a5c5f4cbe6b1e32f37e044989edf7c39f]]]]
Former-commit-id: 1e7d47d2aa
Former-commit-id: 653bc91a5b [formerly f2fad2a476] [formerly c28431a0aad0e60e10b4a8da7fd42e9ae7fcb70b [formerly 331a06fedb]]
Former-commit-id: 30c2b3b055199d708c7c63f16e6f0e62eb968874 [formerly 66d8327025]
Former-commit-id: 0c9c29bff8
|
2014-11-06 13:14:24 -05:00 |
|
Brian.Dyke
|
7110577c6d
|
Merge branch 'master_14.2.4' into master_14.3.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 5cdd9f4256 [formerly 4ac24af0a9] [formerly aae68215c8] [formerly 5cdd9f4256 [formerly 4ac24af0a9] [formerly aae68215c8] [formerly acf00264f4 [formerly aae68215c8 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]]]
Former-commit-id: acf00264f4
Former-commit-id: 2e2d7c8172 [formerly 2743718323] [formerly d0f054998cbe947b901e2eae4a437cb153a73dde [formerly 2b470ad1a1]]
Former-commit-id: 4be36e5bccda05c1cb9a4bc60ef64c8efe6da078 [formerly 54f82d7f6f]
Former-commit-id: f25f4ecb2c
|
2014-11-06 12:55:21 -05:00 |
|
Steve Harris
|
0dac6e50c8
|
Merge branch 'master_14.3.1' (14.3.1-31) into omaha_14.3.1
Former-commit-id: fdbbbca1dc [formerly 0acbe91e58] [formerly 98f2a877f6] [formerly fdbbbca1dc [formerly 0acbe91e58] [formerly 98f2a877f6] [formerly 2ed98bb227 [formerly 98f2a877f6 [formerly b70eb5b35985453e77ef2337728c65161ba60422]]]]
Former-commit-id: 2ed98bb227
Former-commit-id: 2c50a992fc [formerly 1deef1254f] [formerly bcdca38e9131f482352631612ce56dbd5e3f8fdf [formerly 585bebbf12]]
Former-commit-id: 9aa1527261ab831d455bce831ae7acefc31a751e [formerly b72af6ee72]
Former-commit-id: 4614ea10a5
|
2014-11-04 13:05:36 -06:00 |
|
Matthew Howard
|
a07a7db36e
|
Merge changes I8e97aec2,Ib6df55db into asm_14.3.1
* changes:
ASM #16693 changed swear words to all upper case
ASM #16693 fixed typo in the filter
Former-commit-id: 8dd1e096dd [formerly e4fecfd65c] [formerly c2226a2817] [formerly 8dd1e096dd [formerly e4fecfd65c] [formerly c2226a2817] [formerly afc51d425d [formerly c2226a2817 [formerly 0c3de224e672ea5259eaa395672efdf8982a1d45]]]]
Former-commit-id: afc51d425d
Former-commit-id: 60210e932b [formerly 4a7966269b] [formerly 581659aea2b76f619a2e6b8d42ed872fa66e07bd [formerly dfffeb2fd3]]
Former-commit-id: 0847a4b0d674327ee65a157a581eeecd6b6e704a [formerly 79883bc17e]
Former-commit-id: 3cd058379a
|
2014-11-04 13:11:10 -05:00 |
|
Ron Anderson
|
f71fde47d4
|
Issue #3775 Fix db does not exist for getParmList() error when runProcedure creates new mutable db.
Change-Id: I28eef61e4eea77278efe3cbf8828c3357c856785
Former-commit-id: ae81f91f32 [formerly af9fd16f73] [formerly b508a7134c] [formerly ae81f91f32 [formerly af9fd16f73] [formerly b508a7134c] [formerly dd230d9f01 [formerly b508a7134c [formerly de45da45f39169e3924122a7baf68ab6762e74e2]]]]
Former-commit-id: dd230d9f01
Former-commit-id: 8dd8a3852f [formerly 3b2b59689b] [formerly 5febd9ef9398e24dbc4f577ed60f3401628379a1 [formerly 47aadc52c1]]
Former-commit-id: 57397641e560233a895aba26208162da0e7f6958 [formerly 023abd756b]
Former-commit-id: 6c57033c28
|
2014-11-04 11:03:42 -06:00 |
|
Ying-Lian.Shi
|
518a6b6b07
|
ASM #16693 changed swear words to all upper case
Change-Id: I8e97aec281a3e2c307355a2138bde605de41f446
Former-commit-id: fa8b686f3b [formerly 741357ca4e] [formerly 2c2662c191] [formerly fa8b686f3b [formerly 741357ca4e] [formerly 2c2662c191] [formerly da58db313c [formerly 2c2662c191 [formerly ae186e99c22beeda347561fe24dc38a61a699c25]]]]
Former-commit-id: da58db313c
Former-commit-id: c2e6ea58e1 [formerly 090de73852] [formerly 1d3ae5c118599254191c55534ae7cb3f244fd4c4 [formerly 4b578495cd]]
Former-commit-id: f6f2f433ababcf26d3470f4b7854325f6a26761a [formerly 2ef5007880]
Former-commit-id: ec7a960513
|
2014-11-04 14:13:29 +00:00 |
|
Brian.Dyke
|
373307cb12
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 05aa513de3 [formerly e4ce5f5af5] [formerly f3b80f319d] [formerly 05aa513de3 [formerly e4ce5f5af5] [formerly f3b80f319d] [formerly 327491a3a8 [formerly f3b80f319d [formerly 4be7b001bc98e6fe81b3e66940d025fd7511060b]]]]
Former-commit-id: 327491a3a8
Former-commit-id: 165f82baa6 [formerly 4b47c8a5b8] [formerly 5457b558fea660ea182777aee2d28845ca9b22b7 [formerly 196e5e37ac]]
Former-commit-id: 18b51643bb2fa9df166ef6c18ae525114e0a5c31 [formerly 319b2f9b15]
Former-commit-id: 2c716cdca3
|
2014-11-03 14:45:24 -05:00 |
|
Shawn.Hooper
|
ed68c7f502
|
ASM #15033 - Allow generic warning types to show up continuously during Warning cycle
Change-Id: I6e0884b1bbc1e4bed3300bb9dc0f0b3f779aa212
Former-commit-id: 4dc9aaf835 [formerly a9b50b13ce] [formerly 58db54ff05] [formerly 4dc9aaf835 [formerly a9b50b13ce] [formerly 58db54ff05] [formerly f8ee619f16 [formerly 58db54ff05 [formerly 41e18e5104eac8ee3335a80d678d74c7a56b196a]]]]
Former-commit-id: f8ee619f16
Former-commit-id: 349399d47c [formerly bd94e0808a] [formerly 098a9005f9856ceb0c2076bb666817134ef090d3 [formerly c4f4477a7c]]
Former-commit-id: add29fd89ff3539fb7bf399216b83be5a60bf4b4 [formerly 2d012e4a7e]
Former-commit-id: 7ab9b05ef8
|
2014-11-03 10:30:05 -05:00 |
|
Matthew Howard
|
8e034c9fd1
|
Merge "ASM #16693 handles more swear words" into asm_14.3.1
Former-commit-id: bef8c1d1dd [formerly 921bd882fa] [formerly 36e73a31df] [formerly bef8c1d1dd [formerly 921bd882fa] [formerly 36e73a31df] [formerly 39ed75df43 [formerly 36e73a31df [formerly a6ed07b8c01df8576cc54f88dc52d2110d211707]]]]
Former-commit-id: 39ed75df43
Former-commit-id: 81db161133 [formerly 5fc103daf4] [formerly bab8ffcd981dcb3193723398db21c309e45ec6aa [formerly d90db01d4e]]
Former-commit-id: 69febf97096e52f6517807446621276da6ce0018 [formerly c4fc8042ba]
Former-commit-id: 2868a0bf5a
|
2014-11-03 09:56:09 -05:00 |
|
Ying-Lian.Shi
|
f8b6edbabc
|
ASM #16693 fixed typo in the filter
Change-Id: Ib6df55dbaabdbebe8bb670fbffd9c4c901e31857
Former-commit-id: 3c441e63e2 [formerly 66ffae1502] [formerly 12ccfcfa11] [formerly 3c441e63e2 [formerly 66ffae1502] [formerly 12ccfcfa11] [formerly 004b6fb906 [formerly 12ccfcfa11 [formerly 29f50282d5e2415f1d9a876c5515be0c04e27015]]]]
Former-commit-id: 004b6fb906
Former-commit-id: 98cac20eff [formerly d3f52b327e] [formerly e72c4b84dfaec5aff6eea0ba7de3c63a2a5529b1 [formerly 9d4e4a1143]]
Former-commit-id: ea309019df2719a976301f2ea6f5bab382d6ebec [formerly 31d7a25345]
Former-commit-id: 16e67d74b3
|
2014-10-31 10:57:55 +00:00 |
|
Brian.Dyke
|
0f47cafb94
|
Merge branch 'asm_14.2.4' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.4
Former-commit-id: 69d2129918 [formerly 6f57efd2cb] [formerly affc9ed976] [formerly 69d2129918 [formerly 6f57efd2cb] [formerly affc9ed976] [formerly 186f587dd6 [formerly affc9ed976 [formerly ef112c1ff84f846dbe7093bcbb4a94fecf2274d5]]]]
Former-commit-id: 186f587dd6
Former-commit-id: 2ac0a46d5a [formerly 3451202fb4] [formerly 78d112cf0f4f6e30b838e16a2cfacc49b6b0b6eb [formerly 2b7ad1daec]]
Former-commit-id: db1218d9a8d4ddcef5f4588de3bcb19ecfd86fb2 [formerly b7b16413cd]
Former-commit-id: 871cb67e3b
|
2014-10-30 15:05:39 -04:00 |
|
Brian.Dyke
|
bf02ea00db
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 2db7d09544 [formerly ce4a1c042f] [formerly 5e04756c0c] [formerly 2db7d09544 [formerly ce4a1c042f] [formerly 5e04756c0c] [formerly 0f8e11aad4 [formerly 5e04756c0c [formerly 78923886791099b8e4564dd780d8ed64db16a5c1]]]]
Former-commit-id: 0f8e11aad4
Former-commit-id: 9839e39668 [formerly 6907e0d17b] [formerly 71934fda04b2e214188a6c985420d8b7ac8f5e5f [formerly 6c13091ec2]]
Former-commit-id: 6daae8746f33dc00f1e4dbe99c5193c38e5abea4 [formerly 189db02dfe]
Former-commit-id: 79070ce122
|
2014-10-30 15:03:19 -04:00 |
|
Shawn.Hooper
|
1337dd0b72
|
ASM #16800 - Add HRRR under D2D in Weather Element Browser
Change-Id: I829cd7357ccd37e389e88567a4159d0efde9aa41
Former-commit-id: b291c1a96a [formerly 733d5ff94d] [formerly a44d775a27] [formerly b291c1a96a [formerly 733d5ff94d] [formerly a44d775a27] [formerly ec3b831987 [formerly a44d775a27 [formerly 99807ddc4810c08635d5462357dc29e661686e33]]]]
Former-commit-id: ec3b831987
Former-commit-id: e0bb02328b [formerly 3af096ae41] [formerly be5468f1d13cacafbf19dea2b4bcf79e6e8ff9c4 [formerly 2f2bb733a4]]
Former-commit-id: d1f7f21945e5907409307c581cdf60cde005cef3 [formerly 027364c2f9]
Former-commit-id: 87c2032935
|
2014-10-30 14:47:26 -04:00 |
|
Ying-Lian.Shi
|
c1a876c044
|
ASM #16693 handles more swear words
Change-Id: I0b892e3e6748919a206597106604a50f108b1bf7
Former-commit-id: f66932209e [formerly e592171fe2] [formerly 3ae011ba22c7d49600733543ad05625de7fee6f4 [formerly ea9e231074]] [formerly f66932209e [formerly e592171fe2] [formerly 3ae011ba22c7d49600733543ad05625de7fee6f4 [formerly ea9e231074]] [formerly 3d9fa4e763 [formerly ea9e231074 [formerly 6133c233bd3e02b0a8e1540dd6c496997184f11d]]]]
Former-commit-id: 3d9fa4e763
Former-commit-id: c74916d334 [formerly 49aafc099b] [formerly 3fd48b78dd7589b2a55474fa8a67b769df26421c [formerly c8cfe6a2a7]]
Former-commit-id: a627c5ae79fea64096f63d3ad640f19c1a13445f [formerly a9d2b2aa5a]
Former-commit-id: bef4398770
|
2014-10-30 18:22:34 +00:00 |
|
Shawn.Hooper
|
249b05d610
|
ASM #16805 - Increment release number in the awips2-tools rpm spec file
Change-Id: I5ab390facd2343fdcbc9d2f374d275d9ef466aa4
Former-commit-id: 31c1d24165 [formerly c715bdd83a] [formerly 285e4baaec] [formerly 31c1d24165 [formerly c715bdd83a] [formerly 285e4baaec] [formerly 9332029a6d [formerly 285e4baaec [formerly 80801f18a7106c3a7b0dca626fbaca4ec5a67f7f]]]]
Former-commit-id: 9332029a6d
Former-commit-id: 19238b4078 [formerly 01ba6f2df0] [formerly 0288bced58afb5bd1fe2fa083727a6ec5abd6139 [formerly 0b0b922968]]
Former-commit-id: 4a60e0a5206b9f29a194cf60232326289f5a4ec4 [formerly 017fd9461d]
Former-commit-id: bd561efdaa
|
2014-10-30 09:58:02 -04:00 |
|
Brian.Dyke
|
0eb4105029
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: b77a84627c [formerly 7e526df351] [formerly 33522c2b74] [formerly b77a84627c [formerly 7e526df351] [formerly 33522c2b74] [formerly bdd4f6b3cc [formerly 33522c2b74 [formerly 5d2ba108dfbe266edbaee8f5a03e81c02419997a]]]]
Former-commit-id: bdd4f6b3cc
Former-commit-id: dcba79ca46 [formerly 752395b827] [formerly 5639e28155e5c96d6da13d4ed1ba9eaf25136d11 [formerly e3ebd14d63]]
Former-commit-id: fe5157fd0185f80c548dc8cdbda6dd5b2a91ab37 [formerly fad768b8a7]
Former-commit-id: 048d3afc21
|
2014-10-30 09:38:07 -04:00 |
|
Steve Harris
|
72cd0216de
|
Merge branch 'master_14.3.1' (14.3.1-30) into omaha_14.3.1
Former-commit-id: f03e574ae9 [formerly 4bca05c4e0] [formerly 8fd7a28033] [formerly f03e574ae9 [formerly 4bca05c4e0] [formerly 8fd7a28033] [formerly 8d1829bee7 [formerly 8fd7a28033 [formerly ec350c044862fb51513ffa5246c47af33a6ceae5]]]]
Former-commit-id: 8d1829bee7
Former-commit-id: 781d350de5 [formerly a4314b292f] [formerly 264adfebf0375f1a88c454fe9ce80cd2d07b8b90 [formerly 8a6a57d9de]]
Former-commit-id: f10f1ce2ce1bb3b514faa60512cbcd9d28432f0b [formerly 65f75f0463]
Former-commit-id: cd0ab9839f
|
2014-10-30 08:36:12 -05:00 |
|
Ron Anderson
|
0dbdae01ef
|
Issue #3776 Cache SWT fill patterns used in history mode.
Change-Id: Ibb48a997fd0b9c2308ae9f492c7837a10db7285d
Former-commit-id: 96ea0c0f1b [formerly 8f220702f9] [formerly 0c3e19449f] [formerly 96ea0c0f1b [formerly 8f220702f9] [formerly 0c3e19449f] [formerly 53144f55f0 [formerly 0c3e19449f [formerly baefc78796f3d4826d32e5324dd88fa01d242ed5]]]]
Former-commit-id: 53144f55f0
Former-commit-id: a097c88c82 [formerly e946ac633e] [formerly 2fff32fdc3fc2fecdf03b053f430293af5005b48 [formerly 5f83ca27f1]]
Former-commit-id: 41b98b7fa220b25b443be4de2d99d7ba624e1aa4 [formerly 5a57491701]
Former-commit-id: f3069463b5
|
2014-10-29 15:20:18 -05:00 |
|
Steve Harris
|
1d8062aa4e
|
Merge branch 'master_14.3.1' (14.3.1-29) into omaha_14.3.1
Former-commit-id: 06351e31d9 [formerly 9646f78f5d] [formerly 1753861b41] [formerly 06351e31d9 [formerly 9646f78f5d] [formerly 1753861b41] [formerly 15d91d4b2d [formerly 1753861b41 [formerly 9d95570c1686978a5c84a21af29dbc84e53355a3]]]]
Former-commit-id: 15d91d4b2d
Former-commit-id: ee3cd699ae [formerly 51175a1556] [formerly 14adccb1585650d52b7124eca4306560aa4c3d4f [formerly 2a46e1a813]]
Former-commit-id: 98a4a8876c239208add31c9eee0cb8754c9d9f31 [formerly e9b43ad7b6]
Former-commit-id: cbe613818b
|
2014-10-29 08:21:13 -05:00 |
|
Brian.Dyke
|
e633778c0b
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 807a6372e8 [formerly 77b206664f] [formerly 9907c37a0e] [formerly 807a6372e8 [formerly 77b206664f] [formerly 9907c37a0e] [formerly 94ddd59bfc [formerly 9907c37a0e [formerly d12d6cf7e6862a87c00f833ee02e72e5c0ad8252]]]]
Former-commit-id: 94ddd59bfc
Former-commit-id: a78b348c63 [formerly 19eeee8c30] [formerly f8022f3834b60f13434a88ab70bda391e4d9f992 [formerly b396cc467c]]
Former-commit-id: 6c8ed5a47c2674752d0b4217a42f30d1038a69f3 [formerly 1c28509975]
Former-commit-id: c5da475ca8
|
2014-10-28 15:25:05 -04:00 |
|
Brian.Dyke
|
3fde1c9a55
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
Former-commit-id: 839438530c [formerly fe00e65407] [formerly f8ce701c85] [formerly 839438530c [formerly fe00e65407] [formerly f8ce701c85] [formerly 765359aee6 [formerly f8ce701c85 [formerly 52ba693c7d77f4e29db6bc5202c9764509bce58d]]]]
Former-commit-id: 765359aee6
Former-commit-id: 1d644b6112 [formerly 972a6e517c] [formerly 743b1ec5d1d6ad9729e0c83e113487b4f72ae90a [formerly 957781a1b2]]
Former-commit-id: 26c6727a0b57271197d02a12372623b8dd758e55 [formerly 50861065c3]
Former-commit-id: f866615c4b
|
2014-10-28 15:23:11 -04:00 |
|
Ben Steffensmeier
|
36df1e299b
|
Issue #3767 Change default image export name to screenCapture.png.
Former-commit-id: baa1fc1f7f [formerly 4e24cde257] [formerly 1591c9cbb8] [formerly baa1fc1f7f [formerly 4e24cde257] [formerly 1591c9cbb8] [formerly 80c209fef7 [formerly 1591c9cbb8 [formerly 021367d3212e185a2d8d4e5970fc268204bf070b]]]]
Former-commit-id: 80c209fef7
Former-commit-id: 0476884815 [formerly 89194b9816] [formerly 99f53b8aeb02e9794b90d3491a2455d6323c9259 [formerly 14dbd71e9d]]
Former-commit-id: fd2a838bcdafc89a7491a17dc63a52397be2a464 [formerly 101c92c99c]
Former-commit-id: e74823bc2d
|
2014-10-28 14:18:02 -05:00 |
|
Baoyu Yin
|
df313dfd19
|
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 28 fix for FFW error ; fixes #4796
Change-Id: I4f43f1365c3ad4d11314f199c4d896aa542a48c0
Former-commit-id: 2f5803a63d [formerly 3481a6eee5] [formerly c9bc14a668] [formerly 2f5803a63d [formerly 3481a6eee5] [formerly c9bc14a668] [formerly 4252ccfcb1 [formerly c9bc14a668 [formerly 54d2f956f53d2fe8a6fa0550a4236d95013b8ba8]]]]
Former-commit-id: 4252ccfcb1
Former-commit-id: d4013912f3 [formerly 0cfd20d2ae] [formerly 4de753809fba94d4a159290bd76dba3f179d9c7e [formerly 8f9c70f4f7]]
Former-commit-id: 68392073ce3b25f2a13a9ac6859244237675e673 [formerly 6591ced510]
Former-commit-id: bc77150d28
|
2014-10-28 14:32:31 -04:00 |
|
Ron Anderson
|
97cf10bc1a
|
Issue #3766 Fixed return type of GridParmManager.createNewDb
Change-Id: Ib76bf614b09895ef08065da86d3af8d59f490f4c
Former-commit-id: cf13947cf2 [formerly c8ff5af7b6] [formerly ebe43e22d3] [formerly cf13947cf2 [formerly c8ff5af7b6] [formerly ebe43e22d3] [formerly 8362946f0e [formerly ebe43e22d3 [formerly 2e2f83952a6ef00b17d9f4504133c85e93e0126e]]]]
Former-commit-id: 8362946f0e
Former-commit-id: 2b42f118d7 [formerly 63f599abc8] [formerly 0f94dcbc6b9abb1b964811a8f6615846f87e6483 [formerly 673344e596]]
Former-commit-id: 629a2b724aef6d326e2e45e3f869efc45fed4490 [formerly 97163fbb67]
Former-commit-id: 17da4b56c3
|
2014-10-27 18:40:15 -05:00 |
|