Fay.Liang
|
19a29da5de
|
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: eed6737801 [formerly c6bd5d7675 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]
Former-commit-id: c6bd5d7675
Former-commit-id: 6b77894bd0
|
2015-01-12 13:03:31 -05:00 |
|
Rici.Yu
|
9601245461
|
ASM #14946 - GFE: ZFP displaying time for office timezone for zones in different timezone
Change-Id: I082b26ffea4b228baf4f40afb019994d5fe1e7dd
Former-commit-id: 5b5d6fd5cd [formerly cd7212c689 [formerly 18ab87670fbdd007e5027553d4ee58262ae54f22]]
Former-commit-id: cd7212c689
Former-commit-id: eaf241a60a
|
2014-12-16 15:34:35 -05:00 |
|
Richard Peter
|
20fa07c6d3
|
Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java
Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5
Former-commit-id: 8de1ebcb65 [formerly 2457d0e6f7 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]
Former-commit-id: 2457d0e6f7
Former-commit-id: 23eafaba3d
|
2014-12-12 10:36:04 -06:00 |
|
Juliya Dynina
|
b9efbd1e1d
|
Merge "ASM #638 - Inconsistent Type for scale widget value accessed through the varDict." into asm_14.4.1
Former-commit-id: a62ee436c2 [formerly ecaaa1f9fd [formerly 63036a13a555c9a1e7fab05dd48a369221fc27b9]]
Former-commit-id: ecaaa1f9fd
Former-commit-id: 790b5a47f2
|
2014-12-12 11:05:02 -05:00 |
|
Michael Gamazaychikov
|
1cf3ce7058
|
ASM #638 - Inconsistent Type for scale widget value accessed through the varDict.
Change-Id: If81102e5a3b70e224f88a351277e9c29e9f9cc91
Former-commit-id: 40f0e77f30 [formerly 94f06ccbc9 [formerly 3c1ce33424799b39db14f909d8de2946e5aca1bc]]
Former-commit-id: 94f06ccbc9
Former-commit-id: 6123ee67c1
|
2014-12-11 19:37:00 -05:00 |
|
Ron Anderson
|
93bce63af0
|
Merge "Omaha #3885: Merge VTEC route and request changes from VLab." into omaha_14.4.1
Former-commit-id: e0b9900a50 [formerly d7e0d21d27 [formerly 401356d7917aaf84c5ea5c8f92ca32c270d5790a]]
Former-commit-id: d7e0d21d27
Former-commit-id: c4d27803cc
|
2014-12-04 15:44:46 -06:00 |
|
Fay.Liang
|
7aaf379e07
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: f5095bed4e [formerly 028d6bdc33 [formerly ad2451c4d92ef4dcb35f6a0a4ef6ef9403886963]]
Former-commit-id: 028d6bdc33
Former-commit-id: 6e9ff9e139
|
2014-12-04 13:47:03 -05:00 |
|
Fay.Liang
|
07316a588b
|
Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 19194e0aa3 [formerly 83a4987188 [formerly 1fcac564095b86cd4c6103a6484b25bbff2339b2]]
Former-commit-id: 83a4987188
Former-commit-id: f327b9dd5a
|
2014-12-04 13:46:31 -05:00 |
|
Ron Anderson
|
285330ccd0
|
Omaha #3885: Merge VTEC route and request changes from VLab.
Original Ticket: VLab Issue #4953 Added support for managing JSON files in practice mode.
Change-Id: I5ec7c695866554e6209b0c15f6dbe1a460d9d7d9
Former-commit-id: 2417d5a2a7 [formerly 5169e7181f [formerly 16e32018de233fb128a7518415b84e032074932f]]
Former-commit-id: 5169e7181f
Former-commit-id: fd25fe9efc
|
2014-12-04 10:01:18 -06:00 |
|
Bruce.Hundermark
|
9e59b79fbb
|
ASM #645 - GFE: CarSnowAmt smart tool can return incorrect amount
Change-Id: I8aea3ab2ccfec7e411e605ddfdfeef0a823687c2
Former-commit-id: c11898f30a [formerly 6f73b491f8 [formerly 25f4c8acdd8975d3001528212cbc7617cfd39500]]
Former-commit-id: 6f73b491f8
Former-commit-id: c4ca149d67
|
2014-12-04 15:56:01 +00:00 |
|
Sarah Pontius
|
5bc5175729
|
VLab Issue #5492 - Dec 2nd HLS/TCV Code Check-in for 14.3.2 SwIT; fixes #5492
Change-Id: I2d0b6fbe44cb2931fc0cd74a9361cf886b0c9565
Former-commit-id: 5d696b412d [formerly 171a802190 [formerly 24c01f47449607347812e0e676f1d14849d3b47e]]
Former-commit-id: 171a802190
Former-commit-id: 2b37fe2994
|
2014-12-03 11:19:06 -07:00 |
|
Rici.Yu
|
2bc651a84d
|
ASM #625 - modify checkGroup() to display models in multiple columns if needed
Change-Id: I94c5400d21b10b57cf08f4767a5160bfcc554eb9
Former-commit-id: 21e3e584b3 [formerly fb347e4a93 [formerly 07c826efbcfe30dc3fc178601e550a6dbd31eb0b]]
Former-commit-id: fb347e4a93
Former-commit-id: da032a4681
|
2014-12-02 17:05:56 -05:00 |
|
Ron Anderson
|
10be73ae9e
|
Omaha #3875 Fixed SmartScript.createTimeRange(). Added API to better deal with local time.
Change-Id: I8e6f79bf6b7754924480a39f1631ba10a12bdcae
Former-commit-id: ebeb4440ef [formerly 4efd17db74 [formerly e656ec3ccf20ae4a9eae23040e1a08d7032ee42a]]
Former-commit-id: 4efd17db74
Former-commit-id: f6e374db79
|
2014-12-02 11:45:05 -06:00 |
|
Zhidong.Hao
|
aee329f695
|
ASM #624 GFE: default file save directory different from AWIPS 1
Change-Id: I71a9cc3f284ce1c05c3729afc4444362bd0ccd28
Former-commit-id: 58a27aeb75 [formerly 5fd962449b [formerly e6d7e8b2bec9c7cebdf25618897443cff909879d]]
Former-commit-id: 5fd962449b
Former-commit-id: 9a65c297a6
|
2014-12-01 14:39:07 -05:00 |
|
Zhidong.Hao
|
718f3bed15
|
ASM #649 BOIVerifySumTemps crashes on dbName
Change-Id: Iaf05fcbae36ca0afe4c7350b4acf512f8b25111c
Former-commit-id: 4d57e40049 [formerly cfe7f318d8 [formerly 164a7a624780596376b68b7488257b94d4661e80]]
Former-commit-id: cfe7f318d8
Former-commit-id: 10257af037
|
2014-11-26 14:10:27 -05:00 |
|
Zhidong.Hao
|
d345470657
|
ASM #633 GFE: SmartScript method loadParm() exception handler broken
Change-Id: Ic7bef317b06dd695889bcc72cceee4ef41b147bc
Former-commit-id: 1f19ce8a20 [formerly a7019b2c0c [formerly 12ed9574fa7f62d200d50419f88b8ab773930e7a]]
Former-commit-id: a7019b2c0c
Former-commit-id: 0580bc3c94
|
2014-11-26 13:52:01 -05:00 |
|
Fay.Liang
|
7d6c5bd7b5
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: d4845b8b03 [formerly 744fc3f9d7 [formerly 21e36577299266c03c8d860afa844cae29538b0f]]
Former-commit-id: 744fc3f9d7
Former-commit-id: 14f518ff86
|
2014-11-21 13:48:43 -05:00 |
|
Ying-Lian.Shi
|
93ea70fc98
|
ASM #646 GFE: Event end time cannot be set beyond 96 hours on the MakeHazard GUI
Change-Id: I83e1701be2417e7ee6c0223e192cb9e0731c761b
Former-commit-id: 58958ef423 [formerly 89fca6f761 [formerly 6341d72f458c62756f27c851f0db654ab901b7af]]
Former-commit-id: 89fca6f761
Former-commit-id: d5036028d9
|
2014-11-21 14:32:17 +00:00 |
|
Fay.Liang
|
1b162f97df
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 5de19378ee [formerly 00a63ad80c [formerly 9daaa34c341929f784628782c98d5edcf9944ed2]]
Former-commit-id: 00a63ad80c
Former-commit-id: 4205453aa9
|
2014-11-21 09:31:58 -05:00 |
|
Ana Rivera
|
fd10fd21a5
|
VLab Issue #5408 - TCV Update: TCVDictionary.py (O&M RM14468); fixes #5408
Change-Id: If7b45b6415653efe11485956755cd7aaeb49356b
Former-commit-id: 4a4e53cab1 [formerly 250ba9f14c [formerly 82e3e8e69e7ebe738a84603c6f901d619004fe8a]]
Former-commit-id: 250ba9f14c
Former-commit-id: 144d7201a3
|
2014-11-21 13:19:59 +00:00 |
|
Ron Anderson
|
b222744a68
|
VLab Issue #4953 Build fix and another cleanup item.
Change-Id: I5d92df3f452259c93784cd19e75cc7efd8e04dc4
Former-commit-id: 8e4f2100cb [formerly 9485f33476 [formerly 7a33861e7ac4475855778f50e0a5fca5227e5f97]]
Former-commit-id: 9485f33476
Former-commit-id: cd44c42d18
|
2014-11-20 17:07:58 -06:00 |
|
Shawn Hooper
|
7ddf3117bb
|
VLab Issue #5395 - Update gfeConfig.py based on Pablo's email
Change-Id: I100a8d2bb79092bca2157bba018566a650c55f4a
Former-commit-id: 8376f3fce5 [formerly 31d8337c56 [formerly c5278c1a2d81d995ae9df252c461123bcc870320]]
Former-commit-id: 31d8337c56
Former-commit-id: 5773b07a29
|
2014-11-20 17:11:42 -05:00 |
|
Fay.Liang
|
e1e29a8283
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 5bd22b74c6 [formerly 99263f79e1 [formerly 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9]]
Former-commit-id: 99263f79e1
Former-commit-id: 069db81e14
|
2014-11-20 13:32:25 -05:00 |
|
Shawn Hooper
|
c3da295cf3
|
VLab Issue #5395 - Build fixes and gfeConfig.py update
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1
Former-commit-id: cf72b5753d [formerly b7369c5eef [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]
Former-commit-id: b7369c5eef
Former-commit-id: fd57e5334c
|
2014-11-20 13:12:16 -05:00 |
|
Ana Rivera
|
cf2ab16b53
|
VLab Issue #5388 - HTI Update: replace 'MFL' references with SITE in HTI.xml (O&M RM16791); fixes #5388
Change-Id: I69ead4e0ed1103ca21728e46fa654ebaa85258a0
Former-commit-id: c8a750b063 [formerly 29ff0e472b [formerly 27d2c6133b5563614b88fa03e3e706c6da2070a4]]
Former-commit-id: 29ff0e472b
Former-commit-id: ed6514067f
|
2014-11-20 13:57:19 +00:00 |
|
Fay.Liang
|
2b49d6bc2d
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 45b80432d6 [formerly 29561d5324 [formerly 28c3dbd91c1e89ffffd19afa811a08e228a995dd]]
Former-commit-id: 29561d5324
Former-commit-id: a32ec39df2
|
2014-11-19 22:07:54 -05:00 |
|
Ana Rivera
|
c5366c9cd7
|
Merge "VLab Issue #4953 Added support for managing JSON files in practice mode." into tcv_14.3.2
Former-commit-id: 40855f4ebd [formerly 7dacc070d2 [formerly a0946643e3dab3f54c9d1d7a48dbb06b82207b55]]
Former-commit-id: 7dacc070d2
Former-commit-id: 419dc9ff10
|
2014-11-19 16:27:03 -05:00 |
|
Ana Rivera
|
9881e53e34
|
VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382
Change-Id: I1a37fafbb9c2846749a33dd85772f53ccfb514df
Former-commit-id: af00fd8a98 [formerly 2c388bd379 [formerly 7d9cf7bfb3f513314608b6269f437061fc36d090]]
Former-commit-id: 2c388bd379
Former-commit-id: befcdc96f9
|
2014-11-19 20:29:42 +00:00 |
|
Ron Anderson
|
fdafc8c3b8
|
VLab Issue #4953 Added support for managing JSON files in practice mode.
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8
Former-commit-id: 9104023408 [formerly bb451e58c3 [formerly e8ac81c5850b8565ea1e375857cf9dfe531848a0]]
Former-commit-id: bb451e58c3
Former-commit-id: f88fc45470
|
2014-11-19 11:31:49 -06:00 |
|
Ana Rivera
|
ba2775f167
|
VLab Issue #5355 - HTI Update: TCFloodingRainThreat.py (O&M RM16791); fixes #5355
Change-Id: I6461bf9294f037a361f02d3a0de83bf41147e819
Former-commit-id: f1009bccc2 [formerly ac523f4a45 [formerly 682cf4e6376265d0e590cfd1c05f7591204d0e0a]]
Former-commit-id: ac523f4a45
Former-commit-id: e125c384f5
|
2014-11-18 16:06:22 +00:00 |
|
Fay.Liang
|
0b731e3436
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 8ced3a4c73 [formerly 766685c4ec [formerly 7fd3b02016b0d9eed7ecca9c2fd70c3f83695abc]]
Former-commit-id: 766685c4ec
Former-commit-id: e78e70cb81
|
2014-11-14 12:47:46 -05:00 |
|
Ana Rivera
|
a469e36107
|
VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847
Former-commit-id: e54f3305d8 [formerly 061fd0af28 [formerly 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42]]
Former-commit-id: 061fd0af28
Former-commit-id: 499c58a253
|
2014-11-14 16:58:11 +00:00 |
|
Fay.Liang
|
f412dd89b4
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: cfe2f18790 [formerly 3ed251486c [formerly 3f94c7f0ddbf580576b435a715366e3b9f3d9a53]]
Former-commit-id: 3ed251486c
Former-commit-id: aef63b4991
|
2014-11-13 11:50:16 -05:00 |
|
Ron Anderson
|
0bafb89898
|
VLab Issue #4953 Added support for writing Python and/or Java objects to JSON localization files.
Change-Id: Ie25fce637e4294dd20bcfa3933d29b7bf6cc1f30
Former-commit-id: fe531a33e5 [formerly 04b8ffbcd2 [formerly c9d45db2fe6d4693c02b8788d0c7d44b21f5359f]]
Former-commit-id: 04b8ffbcd2
Former-commit-id: 80670c1b7a
|
2014-11-12 14:50:21 -06:00 |
|
Fay.Liang
|
2e75570445
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 4bef6cf18d [formerly 74d7123627 [formerly a141921090ecec459e99d448025f58ca6a957fa6]]
Former-commit-id: 74d7123627
Former-commit-id: e9c6950cc3
|
2014-11-10 14:08:25 -05:00 |
|
Sarah Pontius
|
24498805c3
|
VLab Issue #5277 - HLS/TCV code for OPG 11-17-2014; fixes #5277
Change-Id: I258b2f8c8ddb7f45b02b1035f6fa5006b9fabe1b
Former-commit-id: 061583cd50 [formerly 1ae8fe99aa [formerly 0db3944372ecc381df4e8a918829530391d598db]]
Former-commit-id: 1ae8fe99aa
Former-commit-id: d20799e942
|
2014-11-10 11:20:09 -07:00 |
|
Steve Harris
|
79a5171143
|
Merge tag 'OB_14.3.1-32m' into omaha_14.4.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/build.edex/esb/conf/logback-ingest.xml
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
Former-commit-id: 9de825c332 [formerly a16abe1b8b [formerly 565efec2ebe5a3a1a009d213a77617f4a593aa6b]]
Former-commit-id: a16abe1b8b
Former-commit-id: a8a97501ac
|
2014-11-10 08:42:01 -06:00 |
|
Brian.Dyke
|
bb6e90eb2e
|
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: 1e7d47d2aa [formerly 1cd471ed72 [formerly b9d6c75a5c5f4cbe6b1e32f37e044989edf7c39f]]
Former-commit-id: 1cd471ed72
Former-commit-id: 43b6c9ff82
|
2014-11-06 13:14:24 -05:00 |
|
Brian.Dyke
|
5cdd9f4256
|
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: acf00264f4 [formerly aae68215c8 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]
Former-commit-id: aae68215c8
Former-commit-id: 4ac24af0a9
|
2014-11-06 12:55:21 -05:00 |
|
Ron Anderson
|
2e42452c28
|
Omaha #3557 Fixed NPE when parm is removed from display
Change-Id: I14a82967256a788c25d049a4fd119289c909ad91
Former-commit-id: 1f0fee6536 [formerly f0b58e1daa [formerly 4ba96e15f55e276cf78b06f71d3e5d6c98bcab8b]]
Former-commit-id: f0b58e1daa
Former-commit-id: 377f1a5acb
|
2014-11-04 17:41:19 -06:00 |
|
Ron Anderson
|
ae81f91f32
|
Issue #3775 Fix db does not exist for getParmList() error when runProcedure creates new mutable db.
Change-Id: I28eef61e4eea77278efe3cbf8828c3357c856785
Former-commit-id: dd230d9f01 [formerly b508a7134c [formerly de45da45f39169e3924122a7baf68ab6762e74e2]]
Former-commit-id: b508a7134c
Former-commit-id: af9fd16f73
|
2014-11-04 11:03:42 -06:00 |
|
Brian.Dyke
|
2db7d09544
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 0f8e11aad4 [formerly 5e04756c0c [formerly 78923886791099b8e4564dd780d8ed64db16a5c1]]
Former-commit-id: 5e04756c0c
Former-commit-id: ce4a1c042f
|
2014-10-30 15:03:19 -04:00 |
|
Brian.Dyke
|
8550d7279b
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 01c3167dc9 [formerly a6f8a3b109 [formerly bc44629025f7070a97fcff4a00939e509e6987b1]]
Former-commit-id: a6f8a3b109
Former-commit-id: 6161c5ea4f
|
2014-10-29 16:39:06 -04:00 |
|
Ron Anderson
|
96ea0c0f1b
|
Issue #3776 Cache SWT fill patterns used in history mode.
Change-Id: Ibb48a997fd0b9c2308ae9f492c7837a10db7285d
Former-commit-id: 53144f55f0 [formerly 0c3e19449f [formerly baefc78796f3d4826d32e5324dd88fa01d242ed5]]
Former-commit-id: 0c3e19449f
Former-commit-id: 8f220702f9
|
2014-10-29 15:20:18 -05:00 |
|
Sarah Pontius
|
5ad38545a0
|
VLab Issue #5129 - Merging code from tropical_hazard_formatters to tcv_14.3.2; fixes #5129
Change-Id: Ia7365620c5cc803faa25af4d6c32d3e394497626
Former-commit-id: 760c0d6532 [formerly d7e8bc97b6 [formerly eee97946890b5b0df941e2665a4a183eece14598]]
Former-commit-id: d7e8bc97b6
Former-commit-id: 8d3958527b
|
2014-10-29 13:33:24 -06:00 |
|
Steve Harris
|
031f20c5e9
|
Merge tag 'OB_14.3.1-29m' into omaha_14.4.1
Former-commit-id: 0f40604bcb [formerly 0322884798 [formerly e5cd617f80e90dcfba52058b2a439fade1cfe15e]]
Former-commit-id: 0322884798
Former-commit-id: 7da796e1b0
|
2014-10-29 10:03:20 -05:00 |
|
Ron Anderson
|
b3f991fee2
|
Merge "Omaha #3685 Add support for sending specific products in mixed case" into omaha_14.4.1
Former-commit-id: 9bd76e678f [formerly 8b32ac8f54 [formerly 453e478604f048ae019eeee9bb8e46883b58254e]]
Former-commit-id: 8b32ac8f54
Former-commit-id: 89acc631a3
|
2014-10-28 15:15:16 -05:00 |
|
Steve Harris
|
bf83d93e3f
|
Merge tag 'OB_14.3.1-28m' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
rpms/awips2.core/Installer.gfe.climo/component.spec
Former-commit-id: 19527f50bb [formerly 1b83d045ea [formerly 353674cd0deec2dd86c38dc75c7593d1477a7e78]]
Former-commit-id: 1b83d045ea
Former-commit-id: 40225d128a
|
2014-10-28 13:32:31 -05:00 |
|
Rici.Yu
|
1db772c16a
|
ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility
Change-Id: Ia377d571db68d0078399460ad1d434ba4dad510b
Former-commit-id: b9269162a6 [formerly 45e3b2895b [formerly 902d1b1e4fed90ff216eab2ee5fc3f198bf7fc6d]]
Former-commit-id: 45e3b2895b
Former-commit-id: 28294702a5
|
2014-10-24 10:54:37 -04:00 |
|
Ron Anderson
|
24989f60b0
|
Omaha #3685 Add support for sending specific products in mixed case
Change-Id: I3c7e8bfe285ce7344ddfccf28173a68f3396b126
Former-commit-id: 5d07d13aa0 [formerly e729cd8814 [formerly 18d4fc13ebbd77b3a476bc70252fae1322d631c6]]
Former-commit-id: e729cd8814
Former-commit-id: 64162dd9c0
|
2014-10-22 14:29:30 -05:00 |
|