Brian.Dyke
|
c42733eb39
|
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: 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]
Former-commit-id: 01dfe503f5
|
2014-09-09 11:44:30 -04:00 |
|
Brian.Dyke
|
6c4b121752
|
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: 858b91d677 [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]
Former-commit-id: af477df90e
|
2014-09-08 14:54:16 -04:00 |
|
Brian.Dyke
|
ebf9ad1299
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 9e1ee22146 [formerly 876c6fc4db3901fdcd8dd9a6fb343d2f65254569]
Former-commit-id: 702dd65aa7
|
2014-09-05 11:13:12 -04:00 |
|
Brian.Dyke
|
6f4bdae843
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: d7407481ef [formerly c1f870d9df7579741e5a1d79cdec77293115e968]
Former-commit-id: 9f7fabb002
|
2014-09-05 10:57:14 -04:00 |
|
Ana Rivera
|
ac4f61813f
|
VLab Issue #4601 - Update to SMS DR #16720; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152
Former-commit-id: 6d48576930 [formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]
Former-commit-id: a8b04b8e63
|
2014-09-05 13:27:29 +00:00 |
|
Brian.Dyke
|
e64fe3875e
|
Merge branch 'asm_14.2.3' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.3
Former-commit-id: 7b7ef56b04 [formerly a77577595da1e2dcc8057c5a8b8643a612780339]
Former-commit-id: a610fe6475
|
2014-09-04 15:59:00 -04:00 |
|
Brian.Dyke
|
c48196cd33
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: e762271240 [formerly ad120a9357402fbdedb350cabe88d2becf5d7361]
Former-commit-id: e5227e90de
|
2014-09-04 14:18:34 -04:00 |
|
Qinglu.Lin
|
9c67b89df7
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110
Former-commit-id: 8c28597210 [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]
Former-commit-id: 902b6c55bd
|
2014-09-04 14:09:24 -04:00 |
|
Brian.Dyke
|
5a1fa755f9
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 72e2882496 [formerly 2c4c1a5babcfdcfadeb042a190bc79c7973e1a36]
Former-commit-id: 9e94c2c571
|
2014-09-04 14:01:26 -04:00 |
|
Nate Jensen
|
b1619c055a
|
Issue #3574 Properly dispose radar graphics graphics objects.
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320
Former-commit-id: 2cfbfc1dc4 [formerly 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782]
Former-commit-id: 87d507313b
|
2014-09-04 10:10:37 -05:00 |
|
Brian.Dyke
|
62a70ef5ca
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: 043a95d35e [formerly 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a]
Former-commit-id: d695dd0084
|
2014-09-03 21:14:27 -04:00 |
|
Brian.Dyke
|
e8a85da57a
|
ASM #15697 - Fix Hydro Perspective Issue
Former-commit-id: 121a2d100f [formerly 82d7bbe6bf005e543e1ad6772c6a18024f1b0764]
Former-commit-id: cfe03adff6
|
2014-09-03 21:10:16 -04:00 |
|
Steve Harris
|
e3d99832ec
|
Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
Former-commit-id: 0e869fa6c1 [formerly 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4]
Former-commit-id: afa45bf919
|
2014-09-03 15:22:00 -05:00 |
|
Richard Peter
|
ad59d54110
|
Merge "Issue #3560 Registry objects not re-sent after fully sync" into omaha_14.2.4
Former-commit-id: 3de26efce6 [formerly 5f9298d52d0a11775588ed3742f2c2d3f19da1d0]
Former-commit-id: af87813ea9
|
2014-09-03 09:42:34 -05:00 |
|
Nate Jensen
|
d9d0068a1c
|
Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
Former-commit-id: 0f35426ad0 [formerly 9e0f31fc6601a39938deeaf7e1c8ed8849e43288]
Former-commit-id: c23071f48c
|
2014-09-02 17:34:59 -05:00 |
|
Brian.Dyke
|
43c9dfa397
|
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: fd8ad016ef [formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]
Former-commit-id: 14e64881a1
|
2014-09-02 16:32:54 -04:00 |
|
Brian.Dyke
|
caf5f778e9
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: f0875e724f [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]
Former-commit-id: 611e036e75
|
2014-09-02 16:30:51 -04:00 |
|
Benjamin Phillippe
|
d6c265e78e
|
Issue #3560 Registry objects not re-sent after fully sync
Change-Id: Id38989cf953aacb985d627422c043f8768df2ed0
Former-commit-id: 7265bf54c7 [formerly 15e57fc58bee1045c5574e4d66a727a672ac83cb]
Former-commit-id: 955ac3a670
|
2014-09-02 14:46:50 -05:00 |
|
Brian.Dyke
|
a1889cd15e
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: 368f80f220 [formerly f9daf7d6e906904e96438fabc510e24ff66536d4]
Former-commit-id: b1dbaa0b50
|
2014-09-02 15:09:06 -04:00 |
|
Qinglu.Lin
|
075df9d234
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: 2374673f8d [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]
Former-commit-id: ae13ea419e
|
2014-09-02 14:37:19 -04:00 |
|
Ron Anderson
|
24fba5cc20
|
Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce
Former-commit-id: 46c62a1db6 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]
Former-commit-id: 434d412882
|
2014-09-02 12:21:42 -05:00 |
|
Richard Peter
|
e992fee66a
|
Merge "Issue #3560 Fix for registry memory issue" into omaha_14.2.4
Former-commit-id: be2474da34 [formerly 6789576e88de568c6014c29d099349cec40c7c74]
Former-commit-id: 0e29b2d17f
|
2014-09-02 12:15:38 -05:00 |
|
Benjamin Phillippe
|
393c67dbe9
|
Issue #3560 Fix for registry memory issue
Former-commit-id: ab8b2ef473 [formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]
Former-commit-id: 2da57d3bc2
|
2014-09-02 10:00:35 -05:00 |
|
Dave Hladky
|
9ac2a3adee
|
Issue #3564 Allow for un-authenicated WFS HTTPS connections.
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a
Former-commit-id: 9c3b002990 [formerly 7afe5332fcf41bbc8bb2411944584405f3ba686a]
Former-commit-id: 82fd7189b9
|
2014-09-02 09:38:21 -05:00 |
|
Steve Harris
|
92a45c76fb
|
Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: 3b6a003884 [formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]
Former-commit-id: e7705c328e
|
2014-09-02 08:12:49 -05:00 |
|
Steve Harris
|
6563187041
|
Merge branch 'master_14.2.2' (14.2.2-31) into omaha_14.2.2
Former-commit-id: db74dc031e [formerly 80f0a6df2aeaffce0a58119ae4c3558c7fd08f21]
Former-commit-id: 425e8243f2
|
2014-09-02 08:09:48 -05:00 |
|
Kiran.Shrestha
|
2687526cec
|
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I969cd9ddaa9adc83d5e65571fbb4f45ea89002a6
Former-commit-id: a285439c08 [formerly 1681bea10870df58b3f2cc0d0a59f21c596e9e95]
Former-commit-id: d8bd6a9c70
|
2014-08-29 13:50:55 -04:00 |
|
Brian.Dyke
|
f3eba57747
|
Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: 37c926973c [formerly cff9bfd2697a73ccc18642d8dc057b6a27aa2991]
Former-commit-id: a2f66c8d97
|
2014-08-29 10:07:14 -04:00 |
|
Brian Clements
|
a2010c729a
|
Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040
Former-commit-id: b352bd3944 [formerly b3482522860408c2d052261e845899cf73c2ce96]
Former-commit-id: cfeb16eff8
|
2014-08-29 08:55:58 -05:00 |
|
Juliya Dynina
|
07b6109b5f
|
Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
Former-commit-id: 169dc0ba43 [formerly bb260c4003b477ca51cf5fd9c8d54275af906772]
Former-commit-id: 58a3df78a8
|
2014-08-28 15:52:11 -05:00 |
|
Ana Rivera
|
fbe4d57f6b
|
VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1
Former-commit-id: 160dabc4d1 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]
Former-commit-id: 9af77831a6
|
2014-08-28 18:38:26 +00:00 |
|
Roger Ferrel
|
fe50853adb
|
Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec
Former-commit-id: 6f8c6d6aa1 [formerly bcc9b0a6352151dfdf3ba75063bb87308cb162b4]
Former-commit-id: ef5dfb1f93
|
2014-08-28 13:10:11 -05:00 |
|
David Friedman
|
6209bbc36f
|
ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa
Former-commit-id: de6e79f9e3 [formerly aca832a81bc18d954eadb51755ce04597cd264df]
Former-commit-id: d5c086a022
|
2014-08-28 18:08:23 +00:00 |
|
Daniel.Huffman
|
dc2bc16bcc
|
ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e
Former-commit-id: c89a7169b0 [formerly 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f]
Former-commit-id: ca2aa8811b
|
2014-08-28 17:20:30 +00:00 |
|
steve.naples
|
211e9f7546
|
ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138
Former-commit-id: 1856a05319 [formerly 2e8fb864f410b9b08ccc6de6c0d75666931da3a2]
Former-commit-id: ff52f1dc0a
|
2014-08-28 16:08:17 +00:00 |
|
David Friedman
|
bc22f7309c
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: a2dfe8e8f6 [formerly 6bfa1d6662b00925814be7126592bbe340651649]
Former-commit-id: ea9230b37c
|
2014-08-28 15:43:32 +00:00 |
|
Brian.Dyke
|
0e9a17540d
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 47ae6015e5 [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]
Former-commit-id: a24794ca7b
|
2014-08-28 11:39:48 -04:00 |
|
Steve Harris
|
683c32dc70
|
Merge branch 'master_14.2.2' (14.2.2-30) into omaha_14.2.2
Former-commit-id: 891019aadd [formerly 579781387325a36e27135b8384b2a8b14cb38317]
Former-commit-id: d3b18900b3
|
2014-08-27 11:34:06 -05:00 |
|
Brian.Dyke
|
f7f16ff9eb
|
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: e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]
Former-commit-id: aa83bf804f
|
2014-08-27 11:19:19 -04:00 |
|
Brian.Dyke
|
f2b9203001
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 86f0ed23c1 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]
Former-commit-id: b3767167c7
|
2014-08-26 13:31:34 -04:00 |
|
Brian.Dyke
|
8c803e81d3
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: de56ccebc0 [formerly b13e744dbbcc332b9efd0799e87390bdf9bb1df3]
Former-commit-id: 59bacf90ac
|
2014-08-26 10:56:45 -04:00 |
|
Daniel.Huffman
|
64672eb478
|
ASM #16715 - Reverted and augmented Cities.xml
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0
Former-commit-id: 8962a069be [formerly 2107976bd25c429521d4df7a92a3726a38806ba3]
Former-commit-id: d1cd90b487
|
2014-08-26 13:30:09 +00:00 |
|
Richard Peter
|
2dd7596b68
|
Merge "Issue #3537 Fixed dirPattern in category Local." into omaha_14.2.4
Former-commit-id: 4ba39c5e56 [formerly 5bb3f4a1215902e867d3e9ec5ca1d122067afd7e]
Former-commit-id: 008a3e8f80
|
2014-08-25 14:24:27 -05:00 |
|
Ron Anderson
|
6c3cafda59
|
Merge "Issue #3500 back port of loadConfig.py to fix gfe starup issue" into omaha_14.2.4
Former-commit-id: 4e6bbb4be4 [formerly ae980bfccfedab3091b2708fae0dc36764dbffcb]
Former-commit-id: 4285719a08
|
2014-08-25 14:04:41 -05:00 |
|
Brian Clements
|
f9756abf0a
|
Issue #3500 back port of loadConfig.py to fix gfe starup issue
Change-Id: I841af0ac81b86e499c0b52dedab64431e7f1ecd7
Former-commit-id: 4314f71387 [formerly 2a0af03242692708b3e752417ca7d60d28520768]
Former-commit-id: cf671dcda8
|
2014-08-25 13:34:36 -05:00 |
|
Roger Ferrel
|
6f566c0f38
|
Issue #3537 Fixed dirPattern in category Local.
Former-commit-id: c7a6040792 [formerly d40736ed992300be32ed4a62511fa436e9d167af]
Former-commit-id: e451dd2814
|
2014-08-25 13:23:44 -05:00 |
|
Nate Jensen
|
5c943c5ddc
|
Merge "Issue #3500 remove locking on osgi internals, rework gfe client startup" into omaha_14.2.4
Former-commit-id: 5e46c55a76 [formerly bb08cb510dc3d774e040b7d3a164dfa1d581aa1c]
Former-commit-id: d66ac29640
|
2014-08-25 13:12:46 -05:00 |
|
Steve Harris
|
121a8ce866
|
Merge branch 'master_14.2.2' (14.2.2-29) into omaha_14.2.2
Former-commit-id: a03b5201cb [formerly 67c81cedb7321baad8dcf5fb4cea21ac152d2dcd]
Former-commit-id: d850919303
|
2014-08-25 08:19:50 -05:00 |
|
Brian.Dyke
|
13d523eede
|
Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: a4376ec79f [formerly e673b3ff82b52be4cd4fbe2dab0859b98678f6ef]
Former-commit-id: 0fbc5269ea
|
2014-08-22 16:40:51 -04:00 |
|
Brian.Dyke
|
1839b614df
|
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: 325887e605 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]
Former-commit-id: dd9d7133d9
|
2014-08-22 14:16:22 -04:00 |
|