Baoyu Yin
|
f7d802799f
|
VLab Issue #4624 - AWIPS2_DR_17545 Volume Browser MMP units are wrong ; fixes #4624
Change-Id: I407cf142f9adfc7601b14e12e33223cf344b596c
Former-commit-id: 11f1e39b07 [formerly 2c4a9fbe7c] [formerly 11f1e39b07 [formerly 2c4a9fbe7c] [formerly 7f317934ac [formerly 0eb76fb764113196683d8ae771d7cf37ccc86495]]]
Former-commit-id: 7f317934ac
Former-commit-id: 5aa9d0601a [formerly bca9556bd2]
Former-commit-id: dc075b1dfe
|
2014-09-05 13:35:07 -04:00 |
|
Brian.Dyke
|
9f0254ee22
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 4220590613 [formerly 9e1ee22146] [formerly 4220590613 [formerly 9e1ee22146] [formerly 702dd65aa7 [formerly 876c6fc4db3901fdcd8dd9a6fb343d2f65254569]]]
Former-commit-id: 702dd65aa7
Former-commit-id: 901ed0dca8 [formerly ebf9ad1299]
Former-commit-id: c868172449
|
2014-09-05 11:13:12 -04:00 |
|
Brian.Dyke
|
ea20efaf55
|
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 cdd1e08ee3 [formerly d7407481ef] [formerly 9f7fabb002 [formerly c1f870d9df7579741e5a1d79cdec77293115e968]]]
Former-commit-id: 9f7fabb002
Former-commit-id: 8a3f7aa5d9 [formerly 6f4bdae843]
Former-commit-id: 86e748a02e
|
2014-09-05 10:57:14 -04:00 |
|
Ana Rivera
|
9d16e16770
|
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 c77e5412a6 [formerly 6d48576930] [formerly a8b04b8e63 [formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]]]
Former-commit-id: a8b04b8e63
Former-commit-id: f5695a423d [formerly ac4f61813f]
Former-commit-id: 3e1039b714
|
2014-09-05 13:27:29 +00:00 |
|
Greg Armendariz
|
98c50cb61e
|
Omaha #3545 - Add log and fail message when directories are missing
Former-commit-id: e8a75882ee [formerly 0a988d64e4] [formerly e8a75882ee [formerly 0a988d64e4] [formerly a5359e4547 [formerly 05d45b0c005ce7c8cca51c367754e7e6bca6c085]]]
Former-commit-id: a5359e4547
Former-commit-id: b7535cb9ac [formerly e658278545]
Former-commit-id: 08b5040650
|
2014-09-04 11:52:13 -05:00 |
|
Brian.Dyke
|
fcb029505a
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: fa6b302ab6 [formerly 043a95d35e] [formerly fa6b302ab6 [formerly 043a95d35e] [formerly d695dd0084 [formerly 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a]]]
Former-commit-id: d695dd0084
Former-commit-id: 947d137798 [formerly 62a70ef5ca]
Former-commit-id: fff0709c92
|
2014-09-03 21:14:27 -04:00 |
|
Brian.Dyke
|
7bc9c15a9e
|
ASM #15697 - Fix Hydro Perspective Issue
Former-commit-id: 3ddb5831a0 [formerly 121a2d100f] [formerly 3ddb5831a0 [formerly 121a2d100f] [formerly cfe03adff6 [formerly 82d7bbe6bf005e543e1ad6772c6a18024f1b0764]]]
Former-commit-id: cfe03adff6
Former-commit-id: 50858cac9f [formerly e8a85da57a]
Former-commit-id: 7f1e3b0ead
|
2014-09-03 21:10:16 -04:00 |
|
Nate Jensen
|
6140da7ee6
|
Merge "Omaha #3170 add data times to ffmp geometries being returned, also aggregate data as it is more useful that way" into omaha_14.4.1
Former-commit-id: d977dbfcb0 [formerly 1fd0ed2de6] [formerly d977dbfcb0 [formerly 1fd0ed2de6] [formerly 3a2558eac8 [formerly fbc9b64a0c0734e46ec9db10e0760aa8f2b27c24]]]
Former-commit-id: 3a2558eac8
Former-commit-id: 2781d227f3 [formerly bb8918e96b]
Former-commit-id: 577e3341f6
|
2014-09-03 17:13:06 -05:00 |
|
Steve Harris
|
67969a5118
|
Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
Former-commit-id: 0ea6b72088 [formerly 0e869fa6c1] [formerly 0ea6b72088 [formerly 0e869fa6c1] [formerly afa45bf919 [formerly 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4]]]
Former-commit-id: afa45bf919
Former-commit-id: 550eb6e3ac [formerly e3d99832ec]
Former-commit-id: 49a48c4874
|
2014-09-03 15:22:00 -05:00 |
|
Matt Nash
|
667ce84a62
|
Omaha #3170 add data times to ffmp geometries being returned, also aggregate data as it is more useful that way
Former-commit-id: 90b0619656 [formerly 118d811eee] [formerly 90b0619656 [formerly 118d811eee] [formerly 980d7bf5ad [formerly dd691896f03ba16d683a284a26b8ef923e364834]]]
Former-commit-id: 980d7bf5ad
Former-commit-id: 23d1a555a7 [formerly bce9e0595c]
Former-commit-id: a1ea03c29b
|
2014-09-03 14:11:15 -05:00 |
|
Richard Peter
|
9991229ab4
|
Merge "Issue #3560 Registry objects not re-sent after fully sync" into omaha_14.2.4
Former-commit-id: 1c05f1b459 [formerly 3de26efce6] [formerly 1c05f1b459 [formerly 3de26efce6] [formerly af87813ea9 [formerly 5f9298d52d0a11775588ed3742f2c2d3f19da1d0]]]
Former-commit-id: af87813ea9
Former-commit-id: 1277318360 [formerly ad59d54110]
Former-commit-id: 70e9fd7859
|
2014-09-03 09:42:34 -05:00 |
|
Nate Jensen
|
8248f2f5ab
|
Merge "Omaha #3548 PluginDataObjectFilter fails to start in spring" into omaha_14.4.1
Former-commit-id: a0830d06d5 [formerly 5b80aadbac] [formerly a0830d06d5 [formerly 5b80aadbac] [formerly 80cc58cf25 [formerly e393e1f0455d466edde925608b6f0f1e35351141]]]
Former-commit-id: 80cc58cf25
Former-commit-id: 8e6f1c0b05 [formerly db8517a576]
Former-commit-id: d717f13039
|
2014-09-03 09:21:28 -05:00 |
|
Nate Jensen
|
ea4fd384ca
|
Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
Former-commit-id: a690b853bb [formerly 0f35426ad0] [formerly a690b853bb [formerly 0f35426ad0] [formerly c23071f48c [formerly 9e0f31fc6601a39938deeaf7e1c8ed8849e43288]]]
Former-commit-id: c23071f48c
Former-commit-id: e5f28ab1f9 [formerly d9d0068a1c]
Former-commit-id: fd931efdf2
|
2014-09-02 17:34:59 -05:00 |
|
Brian.Dyke
|
e8143081cb
|
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 9e156775e5 [formerly fd8ad016ef] [formerly 14e64881a1 [formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]]]
Former-commit-id: 14e64881a1
Former-commit-id: 75fccb7361 [formerly 43c9dfa397]
Former-commit-id: 2d9a8a8b40
|
2014-09-02 16:32:54 -04:00 |
|
Brian.Dyke
|
0d6ef0345d
|
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 e425e5bf8c [formerly f0875e724f] [formerly 611e036e75 [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]]
Former-commit-id: 611e036e75
Former-commit-id: 3b9653ef00 [formerly caf5f778e9]
Former-commit-id: 4425e3db61
|
2014-09-02 16:30:51 -04:00 |
|
Benjamin Phillippe
|
2e91209f47
|
Issue #3560 Registry objects not re-sent after fully sync
Change-Id: Id38989cf953aacb985d627422c043f8768df2ed0
Former-commit-id: 30f3289917 [formerly 7265bf54c7] [formerly 30f3289917 [formerly 7265bf54c7] [formerly 955ac3a670 [formerly 15e57fc58bee1045c5574e4d66a727a672ac83cb]]]
Former-commit-id: 955ac3a670
Former-commit-id: df919cf8e3 [formerly d6c265e78e]
Former-commit-id: 6d47294138
|
2014-09-02 14:46:50 -05:00 |
|
Richard Peter
|
d9acda4485
|
Merge "Omaha #3549 improve error message" into omaha_14.4.1
Former-commit-id: d968b5085d [formerly 3c874e1aa1] [formerly d968b5085d [formerly 3c874e1aa1] [formerly 7dc4327ffa [formerly 6e8ad4c9e2046ac950bbf166a09492a69c88cb7e]]]
Former-commit-id: 7dc4327ffa
Former-commit-id: b9db837e14 [formerly 388c1ca919]
Former-commit-id: 6bee61c16f
|
2014-09-02 14:25:18 -05:00 |
|
Qinglu.Lin
|
7ec0ec8877
|
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 b32ea40289 [formerly 2374673f8d] [formerly ae13ea419e [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]]
Former-commit-id: ae13ea419e
Former-commit-id: 3fcdc279ea [formerly 075df9d234]
Former-commit-id: 415af39911
|
2014-09-02 14:37:19 -04:00 |
|
Richard Peter
|
bb5b769b96
|
Merge "Omaha #2926 switched textdb to thrift client" into omaha_14.4.1
Former-commit-id: 612990b3ed [formerly 7628a0a56a] [formerly 612990b3ed [formerly 7628a0a56a] [formerly 0f94b663a4 [formerly 80294bbd891edde5b190941175f73d634f1a3e08]]]
Former-commit-id: 0f94b663a4
Former-commit-id: e3e9368411 [formerly 6151d549ce]
Former-commit-id: eca48d7b90
|
2014-09-02 12:45:37 -05:00 |
|
Nate Jensen
|
78b9181a68
|
Omaha #3549 improve error message
Change-Id: I54cdefd3b77fa5ad8eba9aad6ae8c93b7bd0a67d
Former-commit-id: 3cf81ab39e [formerly fa330b698d] [formerly 3cf81ab39e [formerly fa330b698d] [formerly 37501b884a [formerly 369867e18b5209895137f5e4121fa06bfa2858c7]]]
Former-commit-id: 37501b884a
Former-commit-id: 635604b7a9 [formerly 11b4f270e6]
Former-commit-id: 7336cbb500
|
2014-09-02 12:38:04 -05:00 |
|
Ron Anderson
|
699fe1637e
|
Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce
Former-commit-id: c7fbca0298 [formerly 46c62a1db6] [formerly c7fbca0298 [formerly 46c62a1db6] [formerly 434d412882 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]]]
Former-commit-id: 434d412882
Former-commit-id: 19ce2bb34e [formerly 24fba5cc20]
Former-commit-id: cad80d1060
|
2014-09-02 12:21:42 -05:00 |
|
Richard Peter
|
063bfe0a8a
|
Merge "Issue #3560 Fix for registry memory issue" into omaha_14.2.4
Former-commit-id: abc807850f [formerly be2474da34] [formerly abc807850f [formerly be2474da34] [formerly 0e29b2d17f [formerly 6789576e88de568c6014c29d099349cec40c7c74]]]
Former-commit-id: 0e29b2d17f
Former-commit-id: 050e1f67d3 [formerly e992fee66a]
Former-commit-id: 3408442222
|
2014-09-02 12:15:38 -05:00 |
|
Mark Peters
|
3a8e2b71fd
|
Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: Ib0aa88dd3341ae65aef9b2b02ffbd1645510b95e
Former-commit-id: be6dae0cf9 [formerly ad994bc4c6] [formerly be6dae0cf9 [formerly ad994bc4c6] [formerly 53869a4b0b [formerly 07b54b870e36f37b909d9e7da1f1da4d181b06b0]]]
Former-commit-id: 53869a4b0b
Former-commit-id: 6ddbbc366a [formerly 2c02132ec0]
Former-commit-id: ae87858e3d
|
2014-09-02 11:38:06 -05:00 |
|
Nate Jensen
|
0189b9da69
|
Omaha #3549 improve acarssounding error message
Change-Id: I850eb6bbcd825bee26f0e93226b10d077378dacf
Former-commit-id: 6838a4d8cc [formerly 8570cad6c6] [formerly 6838a4d8cc [formerly 8570cad6c6] [formerly 82ef4c1646 [formerly 16e66726bd5a8f20d6de21708c7f3372a046cea8]]]
Former-commit-id: 82ef4c1646
Former-commit-id: c7fdb67228 [formerly eed90eceeb]
Former-commit-id: fddcabac0a
|
2014-09-02 11:21:10 -05:00 |
|
Benjamin Phillippe
|
94ffd5d5f0
|
Issue #3560 Fix for registry memory issue
Former-commit-id: 12914fb1e5 [formerly ab8b2ef473] [formerly 12914fb1e5 [formerly ab8b2ef473] [formerly 2da57d3bc2 [formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]]]
Former-commit-id: 2da57d3bc2
Former-commit-id: c180ce2758 [formerly 393c67dbe9]
Former-commit-id: 565c858c3e
|
2014-09-02 10:00:35 -05:00 |
|
Dave Hladky
|
f165391a1b
|
Issue #3564 Allow for un-authenicated WFS HTTPS connections.
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a
Former-commit-id: 534b784843 [formerly 9c3b002990] [formerly 534b784843 [formerly 9c3b002990] [formerly 82fd7189b9 [formerly 7afe5332fcf41bbc8bb2411944584405f3ba686a]]]
Former-commit-id: 82fd7189b9
Former-commit-id: 80d0e2594f [formerly 9ac2a3adee]
Former-commit-id: c1bf96b142
|
2014-09-02 09:38:21 -05:00 |
|
Steve Harris
|
f1c77c42ed
|
Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: f7e39c9d6f [formerly 3b6a003884] [formerly f7e39c9d6f [formerly 3b6a003884] [formerly e7705c328e [formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]]]
Former-commit-id: e7705c328e
Former-commit-id: 79c7e0b492 [formerly 92a45c76fb]
Former-commit-id: 6279cdb55c
|
2014-09-02 08:12:49 -05:00 |
|
Steve Harris
|
ecf26b3ac5
|
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
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.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: bddf9c0f27 [formerly 793064063b] [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]
Former-commit-id: 5d58625abc
Former-commit-id: 66b485c000 [formerly d984dd538f]
Former-commit-id: e681e0a457
|
2014-08-29 10:17:52 -05:00 |
|
Baoyu Yin
|
4e755d38e6
|
VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563
Change-Id: I5f5c55486f209b89ecf276bb38d3d42c7f60d1d1
Former-commit-id: cbc7d2813f [formerly bf5bb1bacf] [formerly cbc7d2813f [formerly bf5bb1bacf] [formerly bfc550b378 [formerly 5189ae1c3ce12320045c431d9552036ea9272cef]]]
Former-commit-id: bfc550b378
Former-commit-id: 939e96be9b [formerly 70b265dae2]
Former-commit-id: 88e01c26db
|
2014-08-29 10:17:54 -04:00 |
|
Nate Jensen
|
7e2f184332
|
Merge "Omaha #3356 inject spatial query through spring" into omaha_14.4.1
Former-commit-id: 8f0bd2bb84 [formerly 67d5cb52ae] [formerly 8f0bd2bb84 [formerly 67d5cb52ae] [formerly 822f1a20b0 [formerly afd5131062926a78942db59f35a5c2e719a542da]]]
Former-commit-id: 822f1a20b0
Former-commit-id: 975f93d6cf [formerly 0a8312b09d]
Former-commit-id: 1aa74a38d8
|
2014-08-28 14:32:57 -05:00 |
|
Ana Rivera
|
aec8eba1a7
|
VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1
Former-commit-id: e033ed5546 [formerly 160dabc4d1] [formerly e033ed5546 [formerly 160dabc4d1] [formerly 9af77831a6 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]]
Former-commit-id: 9af77831a6
Former-commit-id: 2045699212 [formerly fbe4d57f6b]
Former-commit-id: dee335f370
|
2014-08-28 18:38:26 +00:00 |
|
Nate Jensen
|
fe0cd768ad
|
Omaha #3356 inject spatial query through spring
Change-Id: I81700e53505e4e599f2d58dc6b8b9c059532811d
Former-commit-id: baece22d79 [formerly 58c85c76ef] [formerly baece22d79 [formerly 58c85c76ef] [formerly 8f226399f7 [formerly 0b7ea786593f963ad1464c3426bcec7ac59914ae]]]
Former-commit-id: 8f226399f7
Former-commit-id: 244395af69 [formerly 9843865254]
Former-commit-id: 2b829dc66b
|
2014-08-28 11:46:25 -05:00 |
|
Nate Jensen
|
91ae999120
|
Merge "Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily" into omaha_14.4.1
Former-commit-id: 9fe0e6df69 [formerly 625f0db18f] [formerly 9fe0e6df69 [formerly 625f0db18f] [formerly 0ee832fc2f [formerly 0a6287431cbcc43ad6f42898a94d173fe451566e]]]
Former-commit-id: 0ee832fc2f
Former-commit-id: 2a7cd5957d [formerly ce138b3e31]
Former-commit-id: 0e0cf3ba67
|
2014-08-28 11:30:45 -05:00 |
|
Ron Anderson
|
932d9e2783
|
Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34
Former-commit-id: dc185b8dd1 [formerly bb1e80b844] [formerly dc185b8dd1 [formerly bb1e80b844] [formerly 2b88ade974 [formerly e7acedd733e4f1acc89f6287fe74ff116376a4ca]]]
Former-commit-id: 2b88ade974
Former-commit-id: 39d00a72ce [formerly 0962c75d18]
Former-commit-id: 56b56ea4f3
|
2014-08-28 10:43:54 -05:00 |
|
David Friedman
|
39c7024668
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: ea1e9feb1d [formerly a2dfe8e8f6] [formerly ea1e9feb1d [formerly a2dfe8e8f6] [formerly ea9230b37c [formerly 6bfa1d6662b00925814be7126592bbe340651649]]]
Former-commit-id: ea9230b37c
Former-commit-id: 10114b0bd1 [formerly bc22f7309c]
Former-commit-id: bfc3fa98b4
|
2014-08-28 15:43:32 +00:00 |
|
Nate Jensen
|
2db6fa9583
|
Merge "Omaha #3503 Composite product generators init after spring beans are loaded" into omaha_14.4.1
Former-commit-id: fb0829fd4d [formerly de69231d3a] [formerly fb0829fd4d [formerly de69231d3a] [formerly afe94aca08 [formerly 1eb554cd30d53daf44de42e0ddd3f35bf8f37bae]]]
Former-commit-id: afe94aca08
Former-commit-id: da6259a198 [formerly 8952d15b12]
Former-commit-id: f3454a7941
|
2014-08-28 10:40:50 -05:00 |
|
Brian.Dyke
|
c5aec69ab3
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 76bd6575b6 [formerly 47ae6015e5] [formerly 76bd6575b6 [formerly 47ae6015e5] [formerly a24794ca7b [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]]]
Former-commit-id: a24794ca7b
Former-commit-id: 065b05e38c [formerly 0e9a17540d]
Former-commit-id: bab69f3764
|
2014-08-28 11:39:48 -04:00 |
|
Baoyu Yin
|
41a0ef8b62
|
VLab Issue #4554 - AWIPS2_DR_17469 Radar Digital Vertical Integrated Liquid wrongly capped at value of >60 kg*m^-2; fixes #4554
Change-Id: I78b45576bd2be9e3baa1f85da5a124de60842e3b
Former-commit-id: 8e88237eab [formerly 2d3589e7af] [formerly 8e88237eab [formerly 2d3589e7af] [formerly ebc018c7f6 [formerly 8d3b878a9c32b77e7bb19b087e7da8de492a4481]]]
Former-commit-id: ebc018c7f6
Former-commit-id: b400d2388c [formerly 81a3dadf58]
Former-commit-id: 88d16f16fd
|
2014-08-28 09:50:26 -04:00 |
|
Baoyu Yin
|
89da9759d6
|
VLab Issue #4553 - AWIPS2_DR_16047 Bad rule in gridImageryStyleRules.xml for Convective Inhibition; fixes #4553
Change-Id: I20f7aeb70828c27e1e6250c54f90f82b88390056
Former-commit-id: 01b3186495 [formerly a42c9f6bc2] [formerly 01b3186495 [formerly a42c9f6bc2] [formerly dc1b76a996 [formerly 3aabef4b96bfb848bb5201d8eac2681b3dc49c83]]]
Former-commit-id: dc1b76a996
Former-commit-id: 612d095a8f [formerly 89fa321360]
Former-commit-id: 24a0253edf
|
2014-08-28 08:34:34 -04:00 |
|
Brian.Dyke
|
7e4ab705cc
|
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: a08db8d73d [formerly e654318431] [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]
Former-commit-id: aa83bf804f
Former-commit-id: f90649d7e7 [formerly f7f16ff9eb]
Former-commit-id: c0dc594eda
|
2014-08-27 11:19:19 -04:00 |
|
Nate Jensen
|
728da699ad
|
Omaha #3132 fix compilation issue from merge
Change-Id: I76e189ff871c2ca8f99806e035abb07087626fba
Former-commit-id: 2f0b209e10 [formerly 0160955244] [formerly 2f0b209e10 [formerly 0160955244] [formerly 3f7170f862 [formerly b45249baec6c6d4f77e5aeb23b910689df192c8a]]]
Former-commit-id: 3f7170f862
Former-commit-id: 66c0933713 [formerly 281f360487]
Former-commit-id: 909bc9c412
|
2014-08-26 18:22:26 -05:00 |
|
Brian Clements
|
a08ebbe0c7
|
Omaha #3503 Composite product generators init after spring beans are loaded
Change-Id: I894adbc14e1bfe183a3f7717d95dba85291a2a09
Former-commit-id: 5dc5530120 [formerly 095f84e71f] [formerly 5dc5530120 [formerly 095f84e71f] [formerly b88f012e69 [formerly f6109e74ff5e26547c8fc03d7bb5ecde1046f689]]]
Former-commit-id: b88f012e69
Former-commit-id: f29fb0a656 [formerly e6b2143a6b]
Former-commit-id: 237bdc0e2a
|
2014-08-26 17:12:34 -05:00 |
|
Steve Harris
|
9d263bc542
|
Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java
Former-commit-id: 8c5026314c [formerly 99ae9bdc10] [formerly 8c5026314c [formerly 99ae9bdc10] [formerly 038b284066 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]]
Former-commit-id: 038b284066
Former-commit-id: 1da31a86dc [formerly c8ba2b1ae6]
Former-commit-id: 84edac842e
|
2014-08-26 16:25:21 -05:00 |
|
Nate Jensen
|
10980c927d
|
Merge "Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env" into omaha_14.4.1
Former-commit-id: e4df37dd05 [formerly 46fc72804a] [formerly e4df37dd05 [formerly 46fc72804a] [formerly 448887b913 [formerly 59c4919564db8f8ebf61fbac6ce2bdd29095479e]]]
Former-commit-id: 448887b913
Former-commit-id: ac814cc6c9 [formerly 88ac1c057c]
Former-commit-id: 6c93e01bda
|
2014-08-26 13:39:15 -05:00 |
|
Brian.Dyke
|
16dc3b41de
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 489fec4b25 [formerly 86f0ed23c1] [formerly 489fec4b25 [formerly 86f0ed23c1] [formerly b3767167c7 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]]]
Former-commit-id: b3767167c7
Former-commit-id: 1b9a28cc62 [formerly f2b9203001]
Former-commit-id: 677ce2fb94
|
2014-08-26 13:31:34 -04:00 |
|
Max Schenkelberg
|
0368097265
|
Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea
Former-commit-id: dacc10bcbc [formerly 63967fbc78] [formerly dacc10bcbc [formerly 63967fbc78] [formerly 78b87b7a63 [formerly 3aff99e787a7368f40cdd161581ead2d3552118c]]]
Former-commit-id: 78b87b7a63
Former-commit-id: 0a7a2fadec [formerly 7cfc26d1d7]
Former-commit-id: 9048064741
|
2014-08-26 11:32:20 -05:00 |
|
Max Schenkelberg
|
2b110b1141
|
Omaha #3541 fixed grid coverage spring
Change-Id: I6c69cbe530daee61127e05d7f94a0e2c92ebe2e7
Former-commit-id: ac67bd42b9 [formerly f7620471da] [formerly ac67bd42b9 [formerly f7620471da] [formerly df50024b63 [formerly f2a76dfda110e231539474bffbde123fbe6313c9]]]
Former-commit-id: df50024b63
Former-commit-id: 87e1c1a257 [formerly 6aff7b7a4c]
Former-commit-id: 47f4520d7c
|
2014-08-26 11:28:42 -05:00 |
|
Richard Peter
|
7964c0697d
|
Omaha #3541 Fix request jvm startup and build
Change-Id: I6141ef1d74430fc43ea11f296c6ab95fc4276d6f
Former-commit-id: 64683e5784 [formerly bf5f1c27a7] [formerly 64683e5784 [formerly bf5f1c27a7] [formerly f478b42e61 [formerly 1c698d67a2c0ed3b11f910b593b1bbbdb2f46a86]]]
Former-commit-id: f478b42e61
Former-commit-id: 832bd8d5e7 [formerly ef45928158]
Former-commit-id: 820fb0085e
|
2014-08-25 21:21:04 -05:00 |
|
Richard Peter
|
147856f43d
|
Merge "Omaha #3541 Updated A2 baseline to reflect request service split" into omaha_14.4.1
Former-commit-id: 64848acf9d [formerly 5cce505b7f] [formerly 64848acf9d [formerly 5cce505b7f] [formerly 651a10715a [formerly e2ed1054e382de6e3656fd9335dedc5af3692c17]]]
Former-commit-id: 651a10715a
Former-commit-id: 0992358153 [formerly eafe010aa1]
Former-commit-id: ac192a5d86
|
2014-08-25 20:43:28 -05:00 |
|
Nate Jensen
|
cbd7d00d1f
|
Omaha #3368 fix deploy-install for developers without ohd repo
Change-Id: Ib1738ed5e11022f5fd154ea85b29019e7c290f65
Former-commit-id: db84f25bfd [formerly 86f64337ff] [formerly db84f25bfd [formerly 86f64337ff] [formerly d43f0589f7 [formerly e9d7e258c60d39ab0d043f1e1cdc0ebcaf998ccc]]]
Former-commit-id: d43f0589f7
Former-commit-id: d4f3d09f11 [formerly aed159a1e2]
Former-commit-id: abec6e86d9
|
2014-08-25 16:16:34 -05:00 |
|