Commit graph

5193 commits

Author SHA1 Message Date
Brian.Dyke
ee0c04ae93 Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 858cfa1078 [formerly 41921f7db2] [formerly 814b9a2869 [formerly 60756ddb841a0daa347493047b76d2fcb93f7f4a]]
Former-commit-id: 814b9a2869
Former-commit-id: a2b18e4bee
2014-09-26 15:15:57 -04:00
Brian.Dyke
fecebad9b6 Merge branch 'asm_14.2.4' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.4
Former-commit-id: 2495e16947 [formerly 989a9c5835] [formerly f1755fb7ae [formerly 4ff65f7c83042dd40b5c2bf37ee54d12315c5714]]
Former-commit-id: f1755fb7ae
Former-commit-id: 8c2c886675
2014-09-26 14:20:34 -04:00
Brian.Dyke
f6af0dd0df Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 396f9755dc [formerly 1ac61fb612] [formerly f26fe97ec4 [formerly 5b570e5229628de88068edee1c70c26eec13f71a]]
Former-commit-id: f26fe97ec4
Former-commit-id: 33525968e3
2014-09-26 14:19:03 -04:00
Sean.Webb
b18f341781 Merge "ASM #16720 - Added updated palt.c to fix seq num in pqact pattern" into asm_14.2.4
Former-commit-id: e8585c9d29 [formerly 96503843d9] [formerly 57342f0256 [formerly d1ce11d690a1acf24fe82fc10acc83302e8f61f9]]
Former-commit-id: 57342f0256
Former-commit-id: d43119b40f
2014-09-26 11:01:04 -05:00
Sean.Webb
9b63e571a7 ASM #16720 - Added updated palt.c to fix seq num in pqact pattern
Change-Id: I08d858beeae7f0fb211a3cf287b7763aa2cff9b5

Former-commit-id: eb959d100a [formerly 628ab54d68] [formerly 7d75d994c1 [formerly d59054c870fee17076aec22cd683ef1586a153da]]
Former-commit-id: 7d75d994c1
Former-commit-id: 039619264f
2014-09-26 10:49:37 -04:00
Shawn.Hooper
b7b38c3c7b ASM #600 - WarnGen: template optional watch inclusion
Change-Id: I282e94236389a907326926a68e2ed810a00b9688

Former-commit-id: 56cd6483ef [formerly da77322fd0] [formerly 831af82c23 [formerly 04bd69f437b897d63ac78d6cbd7c60451366cc6d]]
Former-commit-id: 831af82c23
Former-commit-id: a242e1c43b
2014-09-25 16:25:43 -04:00
Ana Rivera
1b94e7fdb2 VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8

Former-commit-id: e55855b4ff [formerly d96f5fe229] [formerly a72725f9ef [formerly 833cff4f37542078578de96b3b59723f77c31f4c]]
Former-commit-id: a72725f9ef
Former-commit-id: dd45d98a0e
2014-09-25 17:46:53 +00:00
Benjamin Phillippe
13d75b618a Issue #3560 Fixed slow memory leak in registry
Former-commit-id: c7d6c602bd [formerly fb8dc9fe7d] [formerly 81870960e6 [formerly 918119b26864ee246ac2571baa4e380ae21f2ded]]
Former-commit-id: 81870960e6
Former-commit-id: ccd798d7f7
2014-09-24 14:36:34 -05:00
Steve Harris
052d3616fa Merge branch 'master_14.2.4' (14.2.4-12) into omaha_14.2.4
Former-commit-id: 7aa6719ca2 [formerly 38daf108e6] [formerly b1931ae7dc [formerly 9bc599dd5481360d7a00b9c8455805893922127d]]
Former-commit-id: b1931ae7dc
Former-commit-id: c4e7ea8bcd
2014-09-22 22:06:05 -05:00
Ron Anderson
ff0ffd9de6 Issue #3526 Fix errors found during testing in SS
Change-Id: Ic2a7f0b38f57fcae6b3fea904a457642472b2157

Former-commit-id: 12dbec98fd [formerly 5407eb6a71] [formerly ba501a4210 [formerly 0e3e60bcc4b8adcb9efa51df28d4b35bb6228ed7]]
Former-commit-id: ba501a4210
Former-commit-id: dc359baadf
2014-09-22 11:34:31 -05:00
Brian.Dyke
c94cc5fe38 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 813d2be68e [formerly 88d5f872ae] [formerly 9435507b27 [formerly aaae61509d743553186cdefdea0557158b139527]]
Former-commit-id: 9435507b27
Former-commit-id: 1b8af8379f
2014-09-19 13:14:13 -04:00
Brian.Dyke
a4f3bc977a Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 279f67ff54 [formerly 7f49052445] [formerly e601d3fa51 [formerly 88e26cd8b378ffc81db87aee226ceca47ae58aa7]]
Former-commit-id: e601d3fa51
Former-commit-id: 418ba90277
2014-09-19 13:08:06 -04:00
Ana Rivera
9bc42712de VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06

Former-commit-id: 2a25376398 [formerly 9d8c08a09a] [formerly 56f409717f [formerly 3af534fb2778268fee650c09c5aa0346df746ce8]]
Former-commit-id: 56f409717f
Former-commit-id: 030d8c45b7
2014-09-19 15:17:46 +00:00
Steve Harris
a73e067c37 Merge branch 'master_14.2.4' (14.2.4-11) into omaha_14.2.4
Former-commit-id: c6f73593e4 [formerly cf24ea5d59] [formerly a3f154eda2 [formerly 3aced28e0b4fe7e9b64445c050d119f47844e136]]
Former-commit-id: a3f154eda2
Former-commit-id: cca8a13c1a
2014-09-17 14:09:33 -05:00
Qinglu.Lin
6ef0e3bb6e ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5

Former-commit-id: 4bce4db9ef [formerly 0e2be5afd8] [formerly 5e93999662 [formerly e7ab29fbfebb1943e0b0702547dbd353367e797d]]
Former-commit-id: 5e93999662
Former-commit-id: 94ca48dcdf
2014-09-17 10:26:25 -04:00
Brian.Dyke
60589c49b7 Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 8e7ed6cdb5 [formerly 6ad97675c4] [formerly aa5d314407 [formerly f08b8e1a7f684c419abe7995dc3441e6d38b79ce]]
Former-commit-id: aa5d314407
Former-commit-id: ec41118ce0
2014-09-16 10:53:58 -04:00
Steve Harris
ce0faf59dc Merge branch 'master_14.2.4' (14.2.4-10) into omaha_14.2.4
Former-commit-id: 78280f3da4 [formerly c5187836e9] [formerly df2ed908b8 [formerly 4302fd0afe104f3ebdfbd23a771816262a551ecb]]
Former-commit-id: df2ed908b8
Former-commit-id: 7d635ea912
2014-09-16 08:35:36 -05:00
Brian.Dyke
14acc730b3 Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: ebb923be2f [formerly 0621ef756c] [formerly 62af91e45c [formerly ee5e58d1d65cbd78df527b801e9e3edb73a8f178]]
Former-commit-id: 62af91e45c
Former-commit-id: fd0ed28447
2014-09-15 15:08:03 -04:00
Brian.Dyke
d56c30fb40 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 45e7435494 [formerly 21fedc3565] [formerly 83099ee81f [formerly ab9b7ec5424512656d2fb343773fa97658c04ecd]]
Former-commit-id: 83099ee81f
Former-commit-id: 997a7f528f
2014-09-12 14:11:57 -04:00
Ana Rivera
df869efb23 VLab Issue #4671 - Remove duplicate entries from fieldsMenus.xml, updates SMS RM 16720 (HRRR); fixes #4671
Change-Id: I9708b606e5a7d2c2fc9355d765fbad9113a40493

Former-commit-id: b83fd7501f [formerly 09152bc49b] [formerly 909f4d8632 [formerly 94e5089beb782011d107de4aeeb8b35694f2f5c3]]
Former-commit-id: 909f4d8632
Former-commit-id: 84538be9a1
2014-09-11 21:17:43 +00:00
Sean.Webb
55190a347f ASM #16720 - Updated to ldm 6.12.6
Change-Id: Ib005b9e9af0979d4aa1463e5555fd7b42c7fcc89

Former-commit-id: 268db31231 [formerly c805e132bd] [formerly 5918cb05c1 [formerly f07bb36b5f5e01000345a37719e43cb2df4ea7d8]]
Former-commit-id: 5918cb05c1
Former-commit-id: 213208cbf2
2014-09-11 15:13:58 -04:00
Sean.Webb
d1614ae327 ASM #16720 - Updated to ldm 6.12.6
Change-Id: I39f4a529c18995e2b400afbaf0b36fbe7d30d001

Former-commit-id: dec97cd06f [formerly 928c334c03] [formerly a6c15ca070 [formerly fb95ea372530d699c4681cf8ec9e3abce23716c1]]
Former-commit-id: a6c15ca070
Former-commit-id: 6fa9e92a8c
2014-09-11 14:18:50 -04:00
Sean.Webb
e186b2723d ASM #16720 - Updated to ldm 6.12.6
Change-Id: Icf050791541832b370f7d8ceb7a423b500a62d51

Former-commit-id: eb5418a3bb [formerly dfc004e1f0] [formerly 0e72b63663 [formerly 8b1b91c79fa7e59610e21f11af3babaf120859e4]]
Former-commit-id: 0e72b63663
Former-commit-id: 991ea6c13b
2014-09-11 13:39:17 -04:00
David Friedman
78217ab3e9 ASM #16730 - WarnGen Watch wording error when issuing product only over Marine Locations
Change-Id: I361a1635cf11f3c66801f33c74034028b3e0271d

Former-commit-id: 94d78ed010 [formerly 8d7ba120a2] [formerly bed361fe35 [formerly 17d27fca04fb733d74e5bac99bfed3112bd81b6c]]
Former-commit-id: bed361fe35
Former-commit-id: 93e07181c0
2014-09-10 19:28:57 +00:00
Sean.Webb
ce7bae10ea ASM #16720 - Updated to ldm 6.12.6
Change-Id: Ib4c4689eb32f298b8be8782d878c243689608f6a

Former-commit-id: bc6f7cfa3f [formerly db156a51de] [formerly 71d128a180 [formerly ded6663441d8b916ad5b45f2668feac431e84bce]]
Former-commit-id: 71d128a180
Former-commit-id: 2683f36e09
2014-09-10 14:48:19 -04:00
Ben Steffensmeier
6d32c3758e Issue #2875 Add current vectors to field display types.
Former-commit-id: 66676a2014 [formerly 311837012d] [formerly df96ea543a [formerly fbda83fc24a69b6ea8ef335874ecc4146dc392da]]
Former-commit-id: df96ea543a
Former-commit-id: ea4c8d7fe5
2014-09-09 10:35:29 -05:00
Brian.Dyke
901ed0dca8 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 4220590613 [formerly 9e1ee22146] [formerly 702dd65aa7 [formerly 876c6fc4db3901fdcd8dd9a6fb343d2f65254569]]
Former-commit-id: 702dd65aa7
Former-commit-id: ebf9ad1299
2014-09-05 11:13:12 -04:00
Brian.Dyke
8a3f7aa5d9 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: cdd1e08ee3 [formerly d7407481ef] [formerly 9f7fabb002 [formerly c1f870d9df7579741e5a1d79cdec77293115e968]]
Former-commit-id: 9f7fabb002
Former-commit-id: 6f4bdae843
2014-09-05 10:57:14 -04:00
Ana Rivera
f5695a423d VLab Issue #4601 - Update to SMS DR #16720; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152

Former-commit-id: c77e5412a6 [formerly 6d48576930] [formerly a8b04b8e63 [formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]]
Former-commit-id: a8b04b8e63
Former-commit-id: ac4f61813f
2014-09-05 13:27:29 +00:00
Brian.Dyke
f3b51b9187 Merge branch 'asm_14.2.3' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.3
Former-commit-id: 15381f5e9f [formerly 7b7ef56b04] [formerly a610fe6475 [formerly a77577595da1e2dcc8057c5a8b8643a612780339]]
Former-commit-id: a610fe6475
Former-commit-id: e64fe3875e
2014-09-04 15:59:00 -04:00
Brian.Dyke
1ee7743b8b Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: c586c26447 [formerly e762271240] [formerly e5227e90de [formerly ad120a9357402fbdedb350cabe88d2becf5d7361]]
Former-commit-id: e5227e90de
Former-commit-id: c48196cd33
2014-09-04 14:18:34 -04:00
Qinglu.Lin
920b6bb53b ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110

Former-commit-id: 62bcefb9e1 [formerly 8c28597210] [formerly 902b6c55bd [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]]
Former-commit-id: 902b6c55bd
Former-commit-id: 9c67b89df7
2014-09-04 14:09:24 -04:00
Brian.Dyke
6d69d0678c Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 2b613a26fd [formerly 72e2882496] [formerly 9e94c2c571 [formerly 2c4c1a5babcfdcfadeb042a190bc79c7973e1a36]]
Former-commit-id: 9e94c2c571
Former-commit-id: 5a1fa755f9
2014-09-04 14:01:26 -04:00
Nate Jensen
6d47c3c987 Issue #3574 Properly dispose radar graphics graphics objects.
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320

Former-commit-id: a1bccdc57f [formerly 2cfbfc1dc4] [formerly 87d507313b [formerly 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782]]
Former-commit-id: 87d507313b
Former-commit-id: b1619c055a
2014-09-04 10:10:37 -05:00
Brian.Dyke
947d137798 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: fa6b302ab6 [formerly 043a95d35e] [formerly d695dd0084 [formerly 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a]]
Former-commit-id: d695dd0084
Former-commit-id: 62a70ef5ca
2014-09-03 21:14:27 -04:00
Brian.Dyke
50858cac9f ASM #15697 - Fix Hydro Perspective Issue
Former-commit-id: 3ddb5831a0 [formerly 121a2d100f] [formerly cfe03adff6 [formerly 82d7bbe6bf005e543e1ad6772c6a18024f1b0764]]
Former-commit-id: cfe03adff6
Former-commit-id: e8a85da57a
2014-09-03 21:10:16 -04:00
Steve Harris
550eb6e3ac Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
Former-commit-id: 0ea6b72088 [formerly 0e869fa6c1] [formerly afa45bf919 [formerly 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4]]
Former-commit-id: afa45bf919
Former-commit-id: e3d99832ec
2014-09-03 15:22:00 -05:00
Richard Peter
1277318360 Merge "Issue #3560 Registry objects not re-sent after fully sync" into omaha_14.2.4
Former-commit-id: 1c05f1b459 [formerly 3de26efce6] [formerly af87813ea9 [formerly 5f9298d52d0a11775588ed3742f2c2d3f19da1d0]]
Former-commit-id: af87813ea9
Former-commit-id: ad59d54110
2014-09-03 09:42:34 -05:00
Nate Jensen
e5f28ab1f9 Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
Former-commit-id: a690b853bb [formerly 0f35426ad0] [formerly c23071f48c [formerly 9e0f31fc6601a39938deeaf7e1c8ed8849e43288]]
Former-commit-id: c23071f48c
Former-commit-id: d9d0068a1c
2014-09-02 17:34:59 -05:00
Brian.Dyke
75fccb7361 Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
Former-commit-id: 9e156775e5 [formerly fd8ad016ef] [formerly 14e64881a1 [formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]]
Former-commit-id: 14e64881a1
Former-commit-id: 43c9dfa397
2014-09-02 16:32:54 -04:00
Brian.Dyke
3b9653ef00 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: e425e5bf8c [formerly f0875e724f] [formerly 611e036e75 [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]
Former-commit-id: 611e036e75
Former-commit-id: caf5f778e9
2014-09-02 16:30:51 -04:00
Benjamin Phillippe
df919cf8e3 Issue #3560 Registry objects not re-sent after fully sync
Change-Id: Id38989cf953aacb985d627422c043f8768df2ed0

Former-commit-id: 30f3289917 [formerly 7265bf54c7] [formerly 955ac3a670 [formerly 15e57fc58bee1045c5574e4d66a727a672ac83cb]]
Former-commit-id: 955ac3a670
Former-commit-id: d6c265e78e
2014-09-02 14:46:50 -05:00
Brian.Dyke
045647bb37 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: 65f8fc89f0 [formerly 368f80f220] [formerly b1dbaa0b50 [formerly f9daf7d6e906904e96438fabc510e24ff66536d4]]
Former-commit-id: b1dbaa0b50
Former-commit-id: a1889cd15e
2014-09-02 15:09:06 -04:00
Qinglu.Lin
3fcdc279ea ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05

Former-commit-id: b32ea40289 [formerly 2374673f8d] [formerly ae13ea419e [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]
Former-commit-id: ae13ea419e
Former-commit-id: 075df9d234
2014-09-02 14:37:19 -04:00
Ron Anderson
19ce2bb34e Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce

Former-commit-id: c7fbca0298 [formerly 46c62a1db6] [formerly 434d412882 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]]
Former-commit-id: 434d412882
Former-commit-id: 24fba5cc20
2014-09-02 12:21:42 -05:00
Richard Peter
050e1f67d3 Merge "Issue #3560 Fix for registry memory issue" into omaha_14.2.4
Former-commit-id: abc807850f [formerly be2474da34] [formerly 0e29b2d17f [formerly 6789576e88de568c6014c29d099349cec40c7c74]]
Former-commit-id: 0e29b2d17f
Former-commit-id: e992fee66a
2014-09-02 12:15:38 -05:00
Benjamin Phillippe
c180ce2758 Issue #3560 Fix for registry memory issue
Former-commit-id: 12914fb1e5 [formerly ab8b2ef473] [formerly 2da57d3bc2 [formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]]
Former-commit-id: 2da57d3bc2
Former-commit-id: 393c67dbe9
2014-09-02 10:00:35 -05:00
Dave Hladky
80d0e2594f Issue #3564 Allow for un-authenicated WFS HTTPS connections.
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a

Former-commit-id: 534b784843 [formerly 9c3b002990] [formerly 82fd7189b9 [formerly 7afe5332fcf41bbc8bb2411944584405f3ba686a]]
Former-commit-id: 82fd7189b9
Former-commit-id: 9ac2a3adee
2014-09-02 09:38:21 -05:00
Steve Harris
79c7e0b492 Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: f7e39c9d6f [formerly 3b6a003884] [formerly e7705c328e [formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]]
Former-commit-id: e7705c328e
Former-commit-id: 92a45c76fb
2014-09-02 08:12:49 -05:00
Steve Harris
5f0e7e3581 Merge branch 'master_14.2.2' (14.2.2-31) into omaha_14.2.2
Former-commit-id: 142f1bff66 [formerly db74dc031e] [formerly 425e8243f2 [formerly 80f0a6df2aeaffce0a58119ae4c3558c7fd08f21]]
Former-commit-id: 425e8243f2
Former-commit-id: 6563187041
2014-09-02 08:09:48 -05:00