Brian.Dyke
|
3319853886
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: d8271549ff [formerly fe85eb9f70] [formerly 3d9a3de6e4] [formerly 01dfe503f5 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 3c59646613e08582e0a259ecdec538060ca047c5 [formerly c42733eb39]
Former-commit-id: 29364e2b9f
|
2014-09-09 11:44:30 -04:00 |
|
Brian.Dyke
|
4582533601
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: a344be95c8 [formerly 5415a4939a] [formerly 858b91d677] [formerly af477df90e [formerly 858b91d677 [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]]]
Former-commit-id: af477df90e
Former-commit-id: f892d9608dc1fb65163dac3714b16398a7d89022 [formerly 6c4b121752]
Former-commit-id: dde3efc567
|
2014-09-08 14:54:16 -04:00 |
|
Brian.Dyke
|
04ec788c46
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 4b84db346d [formerly 4220590613] [formerly 9e1ee22146] [formerly 702dd65aa7 [formerly 9e1ee22146 [formerly 876c6fc4db3901fdcd8dd9a6fb343d2f65254569]]]
Former-commit-id: 702dd65aa7
Former-commit-id: 8d7d10230b30c894cb57741468e90fccc83202bb [formerly ebf9ad1299]
Former-commit-id: 901ed0dca8
|
2014-09-05 11:13:12 -04:00 |
|
Brian.Dyke
|
47d1e3fc72
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: aac4db559a [formerly cdd1e08ee3] [formerly d7407481ef] [formerly 9f7fabb002 [formerly d7407481ef [formerly c1f870d9df7579741e5a1d79cdec77293115e968]]]
Former-commit-id: 9f7fabb002
Former-commit-id: 837e597fdc8b199428dda951988ca6f8034cc15e [formerly 6f4bdae843]
Former-commit-id: 8a3f7aa5d9
|
2014-09-05 10:57:14 -04:00 |
|
Ana Rivera
|
3018955360
|
VLab Issue #4601 - Update to SMS DR #16720; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152
Former-commit-id: 5a534e377c [formerly c77e5412a6] [formerly 6d48576930] [formerly a8b04b8e63 [formerly 6d48576930 [formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]]]
Former-commit-id: a8b04b8e63
Former-commit-id: 5fa5b948bc157a0af41e64acb9d93c5ee63df7fd [formerly ac4f61813f]
Former-commit-id: f5695a423d
|
2014-09-05 13:27:29 +00:00 |
|
Brian.Dyke
|
919ff95953
|
Merge branch 'asm_14.2.3' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.3
Former-commit-id: 2d86fd1bf1 [formerly 15381f5e9f] [formerly 7b7ef56b04] [formerly a610fe6475 [formerly 7b7ef56b04 [formerly a77577595da1e2dcc8057c5a8b8643a612780339]]]
Former-commit-id: a610fe6475
Former-commit-id: adaa82711061aa3d35c4dd1cf23534e670b43789 [formerly e64fe3875e]
Former-commit-id: f3b51b9187
|
2014-09-04 15:59:00 -04:00 |
|
Brian.Dyke
|
77c6ff9f3f
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: 8216b05646 [formerly c586c26447] [formerly e762271240] [formerly e5227e90de [formerly e762271240 [formerly ad120a9357402fbdedb350cabe88d2becf5d7361]]]
Former-commit-id: e5227e90de
Former-commit-id: f8be9d1c72764746e3b7750b460ddfb0ab41df5f [formerly c48196cd33]
Former-commit-id: 1ee7743b8b
|
2014-09-04 14:18:34 -04:00 |
|
Qinglu.Lin
|
750951ed31
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110
Former-commit-id: efd54751a5 [formerly 62bcefb9e1] [formerly 8c28597210] [formerly 902b6c55bd [formerly 8c28597210 [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]]]
Former-commit-id: 902b6c55bd
Former-commit-id: 4fb24f077ee8254399c85a7e1b5bdb926ee3bf91 [formerly 9c67b89df7]
Former-commit-id: 920b6bb53b
|
2014-09-04 14:09:24 -04:00 |
|
Brian.Dyke
|
864e983578
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: a05fabaeef [formerly 2b613a26fd] [formerly 72e2882496] [formerly 9e94c2c571 [formerly 72e2882496 [formerly 2c4c1a5babcfdcfadeb042a190bc79c7973e1a36]]]
Former-commit-id: 9e94c2c571
Former-commit-id: cd576ae808d85bcd42ccda7363874977497de518 [formerly 5a1fa755f9]
Former-commit-id: 6d69d0678c
|
2014-09-04 14:01:26 -04:00 |
|
Nate Jensen
|
62c34f3978
|
Issue #3574 Properly dispose radar graphics graphics objects.
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320
Former-commit-id: 8cad8cb257 [formerly a1bccdc57f] [formerly 2cfbfc1dc4] [formerly 87d507313b [formerly 2cfbfc1dc4 [formerly 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782]]]
Former-commit-id: 87d507313b
Former-commit-id: 1827159999737e3992f042bc4bf2d5f168d0040c [formerly b1619c055a]
Former-commit-id: 6d47c3c987
|
2014-09-04 10:10:37 -05:00 |
|
Brian.Dyke
|
eaec75b4a4
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: 9c9de8b351 [formerly fa6b302ab6] [formerly 043a95d35e] [formerly d695dd0084 [formerly 043a95d35e [formerly 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a]]]
Former-commit-id: d695dd0084
Former-commit-id: 373646f8580532c5fec0e2325501ff29895686fe [formerly 62a70ef5ca]
Former-commit-id: 947d137798
|
2014-09-03 21:14:27 -04:00 |
|
Brian.Dyke
|
db0a674c09
|
ASM #15697 - Fix Hydro Perspective Issue
Former-commit-id: 08ec7d5802 [formerly 3ddb5831a0] [formerly 121a2d100f] [formerly cfe03adff6 [formerly 121a2d100f [formerly 82d7bbe6bf005e543e1ad6772c6a18024f1b0764]]]
Former-commit-id: cfe03adff6
Former-commit-id: 1b07514d703a75f568de16f4735df22d87a507b5 [formerly e8a85da57a]
Former-commit-id: 50858cac9f
|
2014-09-03 21:10:16 -04:00 |
|
Steve Harris
|
ea7d9a009a
|
Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
Former-commit-id: 197e5ad6ff [formerly 0ea6b72088] [formerly 0e869fa6c1] [formerly afa45bf919 [formerly 0e869fa6c1 [formerly 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4]]]
Former-commit-id: afa45bf919
Former-commit-id: 76a150860a6752d36b9f2a8e4ce9b2e048e62694 [formerly e3d99832ec]
Former-commit-id: 550eb6e3ac
|
2014-09-03 15:22:00 -05:00 |
|
Richard Peter
|
2c45051b4d
|
Merge "Issue #3560 Registry objects not re-sent after fully sync" into omaha_14.2.4
Former-commit-id: 63e9bd37c1 [formerly 1c05f1b459] [formerly 3de26efce6] [formerly af87813ea9 [formerly 3de26efce6 [formerly 5f9298d52d0a11775588ed3742f2c2d3f19da1d0]]]
Former-commit-id: af87813ea9
Former-commit-id: 08f3ee33704050f8d74f62d99046351a72dfb891 [formerly ad59d54110]
Former-commit-id: 1277318360
|
2014-09-03 09:42:34 -05:00 |
|
Nate Jensen
|
6b60f3cab1
|
Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
Former-commit-id: 585516210d [formerly a690b853bb] [formerly 0f35426ad0] [formerly c23071f48c [formerly 0f35426ad0 [formerly 9e0f31fc6601a39938deeaf7e1c8ed8849e43288]]]
Former-commit-id: c23071f48c
Former-commit-id: 224426c54bdc59844b7fe1584ba3efbfd084b116 [formerly d9d0068a1c]
Former-commit-id: e5f28ab1f9
|
2014-09-02 17:34:59 -05:00 |
|
Brian.Dyke
|
00175029c5
|
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: bdba05f6b1 [formerly 9e156775e5] [formerly fd8ad016ef] [formerly 14e64881a1 [formerly fd8ad016ef [formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]]]
Former-commit-id: 14e64881a1
Former-commit-id: 1eb2f1f9e0f92550688af61f814e53ebcd21e85a [formerly 43c9dfa397]
Former-commit-id: 75fccb7361
|
2014-09-02 16:32:54 -04:00 |
|
Brian.Dyke
|
0015f2440e
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 9105ef9aa2 [formerly e425e5bf8c] [formerly f0875e724f] [formerly 611e036e75 [formerly f0875e724f [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]]
Former-commit-id: 611e036e75
Former-commit-id: c73653650f9ff8397fc5371a4686056fcc738000 [formerly caf5f778e9]
Former-commit-id: 3b9653ef00
|
2014-09-02 16:30:51 -04:00 |
|
Benjamin Phillippe
|
12b6ede128
|
Issue #3560 Registry objects not re-sent after fully sync
Change-Id: Id38989cf953aacb985d627422c043f8768df2ed0
Former-commit-id: 0c5dad994f [formerly 30f3289917] [formerly 7265bf54c7] [formerly 955ac3a670 [formerly 7265bf54c7 [formerly 15e57fc58bee1045c5574e4d66a727a672ac83cb]]]
Former-commit-id: 955ac3a670
Former-commit-id: 1b95f465a554716aafbebe611aaa9449d3b2ae13 [formerly d6c265e78e]
Former-commit-id: df919cf8e3
|
2014-09-02 14:46:50 -05:00 |
|
Brian.Dyke
|
8f03fd0274
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: a76150b1a7 [formerly 65f8fc89f0] [formerly 368f80f220] [formerly b1dbaa0b50 [formerly 368f80f220 [formerly f9daf7d6e906904e96438fabc510e24ff66536d4]]]
Former-commit-id: b1dbaa0b50
Former-commit-id: 43f0dc59c33b7743e63ed6a533b0ca2012370c82 [formerly a1889cd15e]
Former-commit-id: 045647bb37
|
2014-09-02 15:09:06 -04:00 |
|
Qinglu.Lin
|
5c521a214c
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: dda32f85e9 [formerly b32ea40289] [formerly 2374673f8d] [formerly ae13ea419e [formerly 2374673f8d [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]]
Former-commit-id: ae13ea419e
Former-commit-id: 153a4d5b66ab5d399ab180ca9af559bd33c0b1bf [formerly 075df9d234]
Former-commit-id: 3fcdc279ea
|
2014-09-02 14:37:19 -04:00 |
|
Ron Anderson
|
215d5f262e
|
Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce
Former-commit-id: c5a32980d6 [formerly c7fbca0298] [formerly 46c62a1db6] [formerly 434d412882 [formerly 46c62a1db6 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]]]
Former-commit-id: 434d412882
Former-commit-id: d4fadbd148424d34474cdcf3ba53cd32ad36b1f0 [formerly 24fba5cc20]
Former-commit-id: 19ce2bb34e
|
2014-09-02 12:21:42 -05:00 |
|
Richard Peter
|
0226ed3c06
|
Merge "Issue #3560 Fix for registry memory issue" into omaha_14.2.4
Former-commit-id: 9489243db9 [formerly abc807850f] [formerly be2474da34] [formerly 0e29b2d17f [formerly be2474da34 [formerly 6789576e88de568c6014c29d099349cec40c7c74]]]
Former-commit-id: 0e29b2d17f
Former-commit-id: d0d9235810b10eed90b7d86cae612e9695672528 [formerly e992fee66a]
Former-commit-id: 050e1f67d3
|
2014-09-02 12:15:38 -05:00 |
|
Benjamin Phillippe
|
f8eac1c5dd
|
Issue #3560 Fix for registry memory issue
Former-commit-id: c00e99fa33 [formerly 12914fb1e5] [formerly ab8b2ef473] [formerly 2da57d3bc2 [formerly ab8b2ef473 [formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]]]
Former-commit-id: 2da57d3bc2
Former-commit-id: 297c1c315b814d7db8fde2a56eeb56d15518cf06 [formerly 393c67dbe9]
Former-commit-id: c180ce2758
|
2014-09-02 10:00:35 -05:00 |
|
Dave Hladky
|
77b4003cf8
|
Issue #3564 Allow for un-authenicated WFS HTTPS connections.
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a
Former-commit-id: 4b22309742 [formerly 534b784843] [formerly 9c3b002990] [formerly 82fd7189b9 [formerly 9c3b002990 [formerly 7afe5332fcf41bbc8bb2411944584405f3ba686a]]]
Former-commit-id: 82fd7189b9
Former-commit-id: cb2ec0507bd999daab7cd2f39d5b6532cfef68ed [formerly 9ac2a3adee]
Former-commit-id: 80d0e2594f
|
2014-09-02 09:38:21 -05:00 |
|
Steve Harris
|
6184a8ef57
|
Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: 9e79ff1cff [formerly f7e39c9d6f] [formerly 3b6a003884] [formerly e7705c328e [formerly 3b6a003884 [formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]]]
Former-commit-id: e7705c328e
Former-commit-id: 5cde04894fc320a0e396dcbcda7917b88bf7faf3 [formerly 92a45c76fb]
Former-commit-id: 79c7e0b492
|
2014-09-02 08:12:49 -05:00 |
|
Steve Harris
|
527bb46f95
|
Merge branch 'master_14.2.2' (14.2.2-31) into omaha_14.2.2
Former-commit-id: db74ef9c6d [formerly 142f1bff66] [formerly db74dc031e] [formerly 425e8243f2 [formerly db74dc031e [formerly 80f0a6df2aeaffce0a58119ae4c3558c7fd08f21]]]
Former-commit-id: 425e8243f2
Former-commit-id: e4867f4026004901057b68452841e0b1dfb767d8 [formerly 6563187041]
Former-commit-id: 5f0e7e3581
|
2014-09-02 08:09:48 -05:00 |
|
Kiran.Shrestha
|
8ad4aa78a8
|
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I969cd9ddaa9adc83d5e65571fbb4f45ea89002a6
Former-commit-id: b4a897c5a7 [formerly 3abf28f856] [formerly a285439c08] [formerly d8bd6a9c70 [formerly a285439c08 [formerly 1681bea10870df58b3f2cc0d0a59f21c596e9e95]]]
Former-commit-id: d8bd6a9c70
Former-commit-id: c3bd761b7a4aa4335ef9629b9656cb7ddd1bdbd2 [formerly 2687526cec]
Former-commit-id: f278d7edbf
|
2014-08-29 13:50:55 -04:00 |
|
Brian.Dyke
|
d805faa88c
|
Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: 31c13bf0bf [formerly a5519a28d9] [formerly 37c926973c] [formerly a2f66c8d97 [formerly 37c926973c [formerly cff9bfd2697a73ccc18642d8dc057b6a27aa2991]]]
Former-commit-id: a2f66c8d97
Former-commit-id: 39e8d8ffde8b1fa357b628c70cca02439f025ba2 [formerly f3eba57747]
Former-commit-id: d14d2b9a30
|
2014-08-29 10:07:14 -04:00 |
|
Brian Clements
|
3015aef7b9
|
Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040
Former-commit-id: c0b132d6ee [formerly 981390eb22] [formerly b352bd3944] [formerly cfeb16eff8 [formerly b352bd3944 [formerly b3482522860408c2d052261e845899cf73c2ce96]]]
Former-commit-id: cfeb16eff8
Former-commit-id: da0614500f744bdca9a9cd20f1050898018e3164 [formerly a2010c729a]
Former-commit-id: c337087043
|
2014-08-29 08:55:58 -05:00 |
|
Juliya Dynina
|
f1332a37cc
|
Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
Former-commit-id: d911b87c7e [formerly 5f001b7ad7] [formerly 169dc0ba43] [formerly 58a3df78a8 [formerly 169dc0ba43 [formerly bb260c4003b477ca51cf5fd9c8d54275af906772]]]
Former-commit-id: 58a3df78a8
Former-commit-id: d8e22d556662dfb3ac872fc696a556d59c038540 [formerly 07b6109b5f]
Former-commit-id: 62d2e61a75
|
2014-08-28 15:52:11 -05:00 |
|
Ana Rivera
|
ae4ea166aa
|
VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1
Former-commit-id: b03dd41331 [formerly e033ed5546] [formerly 160dabc4d1] [formerly 9af77831a6 [formerly 160dabc4d1 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]]
Former-commit-id: 9af77831a6
Former-commit-id: 55222fba76e6458ccc65b959b86f2e7bff061cbc [formerly fbe4d57f6b]
Former-commit-id: 2045699212
|
2014-08-28 18:38:26 +00:00 |
|
Roger Ferrel
|
6fcac050be
|
Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec
Former-commit-id: 60d6b770aa [formerly 15c73be56c] [formerly 6f8c6d6aa1] [formerly ef5dfb1f93 [formerly 6f8c6d6aa1 [formerly bcc9b0a6352151dfdf3ba75063bb87308cb162b4]]]
Former-commit-id: ef5dfb1f93
Former-commit-id: a75847a14ce68662ce3ae2487c06dcc0a6e1e748 [formerly fe50853adb]
Former-commit-id: ffa95bce90
|
2014-08-28 13:10:11 -05:00 |
|
David Friedman
|
182df433a9
|
ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa
Former-commit-id: 16c903e2c5 [formerly 9c2545ed64] [formerly de6e79f9e3] [formerly d5c086a022 [formerly de6e79f9e3 [formerly aca832a81bc18d954eadb51755ce04597cd264df]]]
Former-commit-id: d5c086a022
Former-commit-id: a179ad829ac12e1773af11cae397893e6b1617b6 [formerly 6209bbc36f]
Former-commit-id: b2cc41f3de
|
2014-08-28 18:08:23 +00:00 |
|
Daniel.Huffman
|
eab387d780
|
ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e
Former-commit-id: 39f7795b7c [formerly c3731d5622] [formerly c89a7169b0] [formerly ca2aa8811b [formerly c89a7169b0 [formerly 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f]]]
Former-commit-id: ca2aa8811b
Former-commit-id: 4e8f9df5152a35ae2d89acc7ab6ad942931f615c [formerly dc2bc16bcc]
Former-commit-id: eb9b743c46
|
2014-08-28 17:20:30 +00:00 |
|
steve.naples
|
899ff32548
|
ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138
Former-commit-id: bf9924b0e9 [formerly 4205d83452] [formerly 1856a05319] [formerly ff52f1dc0a [formerly 1856a05319 [formerly 2e8fb864f410b9b08ccc6de6c0d75666931da3a2]]]
Former-commit-id: ff52f1dc0a
Former-commit-id: 2916716519dd7ee38032637d8a99f6fb81e1e7ba [formerly 211e9f7546]
Former-commit-id: 1532c683a1
|
2014-08-28 16:08:17 +00:00 |
|
David Friedman
|
25e0bcdc6f
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: bb421fd3e4 [formerly ea1e9feb1d] [formerly a2dfe8e8f6] [formerly ea9230b37c [formerly a2dfe8e8f6 [formerly 6bfa1d6662b00925814be7126592bbe340651649]]]
Former-commit-id: ea9230b37c
Former-commit-id: 74a7d88387ec143a88a15084374737200a0e031a [formerly bc22f7309c]
Former-commit-id: 10114b0bd1
|
2014-08-28 15:43:32 +00:00 |
|
Brian.Dyke
|
7288e9be2a
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: cbfd380b43 [formerly 76bd6575b6] [formerly 47ae6015e5] [formerly a24794ca7b [formerly 47ae6015e5 [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]]]
Former-commit-id: a24794ca7b
Former-commit-id: d87cfe22daebbd0f64708e2b5401b5a9bc43a95e [formerly 0e9a17540d]
Former-commit-id: 065b05e38c
|
2014-08-28 11:39:48 -04:00 |
|
Steve Harris
|
1508060d35
|
Merge branch 'master_14.2.2' (14.2.2-30) into omaha_14.2.2
Former-commit-id: b551b21437 [formerly 080a50d28c] [formerly 891019aadd] [formerly d3b18900b3 [formerly 891019aadd [formerly 579781387325a36e27135b8384b2a8b14cb38317]]]
Former-commit-id: d3b18900b3
Former-commit-id: 21a5baadcdeaf201b5a2a14f4cba871239a0bec7 [formerly 683c32dc70]
Former-commit-id: 60d5eec1b0
|
2014-08-27 11:34:06 -05:00 |
|
Brian.Dyke
|
4a56b6f6e1
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]
Former-commit-id: aa83bf804f
Former-commit-id: c580412a81e899b2803a785d3de77c4ea7ca97b3 [formerly f7f16ff9eb]
Former-commit-id: f90649d7e7
|
2014-08-27 11:19:19 -04:00 |
|
Brian.Dyke
|
ef2afe4f88
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: acc3321457 [formerly 489fec4b25] [formerly 86f0ed23c1] [formerly b3767167c7 [formerly 86f0ed23c1 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]]]
Former-commit-id: b3767167c7
Former-commit-id: dfa43aa5c4d4a07843b46cd3b23eed8a26739086 [formerly f2b9203001]
Former-commit-id: 1b9a28cc62
|
2014-08-26 13:31:34 -04:00 |
|
Brian.Dyke
|
c2b8aa9023
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: b99d31c7e6 [formerly 8ac44dfbd3] [formerly de56ccebc0] [formerly 59bacf90ac [formerly de56ccebc0 [formerly b13e744dbbcc332b9efd0799e87390bdf9bb1df3]]]
Former-commit-id: 59bacf90ac
Former-commit-id: 1aa12a57a91c266d9cae0f47f1830ad807f2a1d0 [formerly 8c803e81d3]
Former-commit-id: dc14c2e6ce
|
2014-08-26 10:56:45 -04:00 |
|
Daniel.Huffman
|
ebae452135
|
ASM #16715 - Reverted and augmented Cities.xml
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0
Former-commit-id: d7c82cf4be [formerly e2e132e7a5] [formerly 8962a069be] [formerly d1cd90b487 [formerly 8962a069be [formerly 2107976bd25c429521d4df7a92a3726a38806ba3]]]
Former-commit-id: d1cd90b487
Former-commit-id: 1d0b849f95b96d174f8fe7e2dac8ce729d2a1e58 [formerly 64672eb478]
Former-commit-id: 7d09253674
|
2014-08-26 13:30:09 +00:00 |
|
Richard Peter
|
7fc06eff0d
|
Merge "Issue #3537 Fixed dirPattern in category Local." into omaha_14.2.4
Former-commit-id: 6396f11532 [formerly ab7facb903] [formerly 4ba39c5e56] [formerly 008a3e8f80 [formerly 4ba39c5e56 [formerly 5bb3f4a1215902e867d3e9ec5ca1d122067afd7e]]]
Former-commit-id: 008a3e8f80
Former-commit-id: db9e0e2a7fdda0d46fab9872d270205026e87d41 [formerly 2dd7596b68]
Former-commit-id: 17c2c42cd2
|
2014-08-25 14:24:27 -05:00 |
|
Ron Anderson
|
1e3a94e3e4
|
Merge "Issue #3500 back port of loadConfig.py to fix gfe starup issue" into omaha_14.2.4
Former-commit-id: dee9a699ad [formerly 03173a9fe7] [formerly 4e6bbb4be4] [formerly 4285719a08 [formerly 4e6bbb4be4 [formerly ae980bfccfedab3091b2708fae0dc36764dbffcb]]]
Former-commit-id: 4285719a08
Former-commit-id: 06e2debcd2974ef2d50793405e7728d260c70777 [formerly 6c3cafda59]
Former-commit-id: fe93cb7510
|
2014-08-25 14:04:41 -05:00 |
|
Brian Clements
|
cb34376804
|
Issue #3500 back port of loadConfig.py to fix gfe starup issue
Change-Id: I841af0ac81b86e499c0b52dedab64431e7f1ecd7
Former-commit-id: 5d794a5135 [formerly 960eb2dc29] [formerly 4314f71387] [formerly cf671dcda8 [formerly 4314f71387 [formerly 2a0af03242692708b3e752417ca7d60d28520768]]]
Former-commit-id: cf671dcda8
Former-commit-id: ad4290afd9237cad2ca05f14d0e5d7191bb86b8b [formerly f9756abf0a]
Former-commit-id: 253b14b895
|
2014-08-25 13:34:36 -05:00 |
|
Roger Ferrel
|
a2d92f8552
|
Issue #3537 Fixed dirPattern in category Local.
Former-commit-id: eb6992b3fa [formerly 1ff321ce51] [formerly c7a6040792] [formerly e451dd2814 [formerly c7a6040792 [formerly d40736ed992300be32ed4a62511fa436e9d167af]]]
Former-commit-id: e451dd2814
Former-commit-id: dce5cb1b876921fa48d76b01c9951abb227edc02 [formerly 6f566c0f38]
Former-commit-id: 3d3f9cfb8c
|
2014-08-25 13:23:44 -05:00 |
|
Nate Jensen
|
702239de9f
|
Merge "Issue #3500 remove locking on osgi internals, rework gfe client startup" into omaha_14.2.4
Former-commit-id: 41a7e2dbcd [formerly 0852d804ba] [formerly 5e46c55a76] [formerly d66ac29640 [formerly 5e46c55a76 [formerly bb08cb510dc3d774e040b7d3a164dfa1d581aa1c]]]
Former-commit-id: d66ac29640
Former-commit-id: 4fa0bfb69b17bae7253b0667ffaee25774b64820 [formerly 5c943c5ddc]
Former-commit-id: d824e365d1
|
2014-08-25 13:12:46 -05:00 |
|
Steve Harris
|
2560ce6724
|
Merge branch 'master_14.2.2' (14.2.2-29) into omaha_14.2.2
Former-commit-id: 8a684bb351 [formerly 8aadfe944a] [formerly a03b5201cb] [formerly d850919303 [formerly a03b5201cb [formerly 67c81cedb7321baad8dcf5fb4cea21ac152d2dcd]]]
Former-commit-id: d850919303
Former-commit-id: 9438eed61e44da4ec8f772bce9429f8e45fdf8f7 [formerly 121a8ce866]
Former-commit-id: 28937f26bc
|
2014-08-25 08:19:50 -05:00 |
|
Brian.Dyke
|
f72c19fd3c
|
Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: aecf73e71a [formerly a841eb53e5] [formerly a4376ec79f] [formerly 0fbc5269ea [formerly a4376ec79f [formerly e673b3ff82b52be4cd4fbe2dab0859b98678f6ef]]]
Former-commit-id: 0fbc5269ea
Former-commit-id: 6d6fe3691f712c1bf4868acb2bc3528ca639977e [formerly 13d523eede]
Former-commit-id: caa50716ff
|
2014-08-22 16:40:51 -04:00 |
|
Brian.Dyke
|
e348a6abc7
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: 6402cb7d89 [formerly 2ddc920a4a] [formerly 325887e605] [formerly dd9d7133d9 [formerly 325887e605 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]
Former-commit-id: dd9d7133d9
Former-commit-id: 7dbc20e2697aab4991870bf8493b74b08acbe56b [formerly 1839b614df]
Former-commit-id: c8e9153884
|
2014-08-22 14:16:22 -04:00 |
|