mjames-upc
|
194adffea5
|
another attempt to merge UPC master_14.4.1 into origin/ncep_14.4.1-n
Former-commit-id: f25e918e50
Former-commit-id: c921ec69d6
|
2015-09-03 15:48:53 -06:00 |
|
AWIPS User
|
2303189fbd
|
for build 14.4.1-1n16
Former-commit-id: ec8386295f [formerly 6c3570e665] [formerly 7930f1f4e0] [formerly af326d545dad190b93c13b725b01a53faa2783d7 [formerly 6ff5ac1948ec066ae914e7a02602c6fd380569ec] [formerly 7930f1f4e0 [formerly f374741cd5]]]
Former-commit-id: 1add3fae03dc311c2499f4f1a9154e904a7c4dab [formerly 3c35f7e8477a535f8b13813c955a81c49575cb60] [formerly 592e9581c2 [formerly ae3f8a50f5]]
Former-commit-id: 592e9581c2
Former-commit-id: 25e73e6459
|
2015-07-10 20:42:02 -06:00 |
|
Rici.Yu
|
bcfc8e9d01
|
ASM #17487 - Fix gfeclient hanging due to lock file conflict
Change-Id: I8131c781d332135eaf9955fdf3e172b61c4e92da
Former-commit-id: 69a41f1a09 [formerly 5130d6e7b0 [formerly 50ab0b2325] [formerly 69a41f1a09 [formerly d3c911a1f425a81d35ebd4184b626f256183206b]]]
Former-commit-id: 5130d6e7b0 [formerly 50ab0b2325]
Former-commit-id: 5130d6e7b0
Former-commit-id: 325f522127
|
2015-06-08 16:27:47 -04:00 |
|
Ron Anderson
|
79d44036c1
|
Omaha #4467 Fix issue with unicode string from formatter
Change-Id: I4f5792953aef2bccecc7576d8282bcbd5d89671a
Former-commit-id: 88d48b1360 [formerly 88149f64ae [formerly 44d955ceb5] [formerly 88d48b1360 [formerly e95402f2b4bfef8bfb1de89b6ff58cf0e19a8daf]]]
Former-commit-id: 88149f64ae [formerly 44d955ceb5]
Former-commit-id: 88149f64ae
Former-commit-id: ef62ef8934
|
2015-05-27 15:28:29 -05:00 |
|
Fay.Liang
|
80aef225b6
|
Merge tag 'OB_14.3.4-2' into master_14.4.1
14.3.4-2
Former-commit-id: 78e5fba897 [formerly cacdfc2c5f [formerly 9e651a81c3] [formerly 78e5fba897 [formerly ab0f58ebd6b4ce61525b1ec768fb6b293098cd91]]]
Former-commit-id: cacdfc2c5f [formerly 9e651a81c3]
Former-commit-id: cacdfc2c5f
Former-commit-id: c1f576d374
|
2015-05-22 14:52:28 -04:00 |
|
Ana Rivera
|
cbe40207f4
|
VLab Issue #8326 -DR17492 TCStormSurgeThreat Update 2; fixes #8326
Change-Id: Idac35a7a2465257147f9e4fb3f5e70d7e3713192
Former-commit-id: f7128dbcbe [formerly df283046b2 [formerly 3873a7bc36] [formerly f7128dbcbe [formerly 377a104856ac009f465a534e9cec03754d5c2272]]]
Former-commit-id: df283046b2 [formerly 3873a7bc36]
Former-commit-id: df283046b2
Former-commit-id: 330e3bb85e
|
2015-05-22 18:28:22 +00:00 |
|
Ana Rivera
|
bb96a9f82f
|
VLab Issue #8326 - DR17492 A new TCStormSurgeThreat procedure; fixes #8326
Change-Id: I70b38b4e6c21372a4522446e94e370e90e342334
Former-commit-id: 43be56bfec [formerly 8d7dea1c0c [formerly b5ac7fef0b] [formerly 43be56bfec [formerly bd4722e28a60504f610350ccc7c0b6eb9cd6898e]]]
Former-commit-id: 8d7dea1c0c [formerly b5ac7fef0b]
Former-commit-id: 8d7dea1c0c
Former-commit-id: edb8279f88
|
2015-05-21 23:30:28 +00:00 |
|
Ana Rivera
|
0bc0fe1e8b
|
VLab Issue #8116 - Modify WCOSS NWPS Run scripts to support a 3rd option; fixes; #8116
Change-Id: Icafd7505b59dc0bf3673c655ceff93c3fefb5176
Former-commit-id: 153619e7ff [formerly 6914d33292 [formerly de340cde75] [formerly 153619e7ff [formerly a64386381a2543f3a01e418abc0ec36cc317fbeb]]]
Former-commit-id: 6914d33292 [formerly de340cde75]
Former-commit-id: 6914d33292
Former-commit-id: bc952e8cc7
|
2015-05-11 18:07:25 +00:00 |
|
Ana Rivera
|
82f205e0ba
|
Merge branch 'master_14.4.1'(OB_14.4.1-36) into emc_14.4.1
Change-Id: Ie153b2a36947fa999b47cde069c1915e371c3f98
Former-commit-id: 05090b3d96 [formerly c5cb33d841 [formerly fd55cd3753] [formerly 05090b3d96 [formerly 5abb5644ef50d32fe131941ea46c70f371ed9a3b]]]
Former-commit-id: c5cb33d841 [formerly fd55cd3753]
Former-commit-id: c5cb33d841
Former-commit-id: 109727a7d8
|
2015-05-11 16:55:58 +00:00 |
|
Ana Rivera
|
7b1eb2e04d
|
VLab Issue #8081 - Baseline NWPS Weather Element groups; fixes #8081
Change-Id: I901d43e6474cb659407b6bcf1e1798c7de2dc341
Former-commit-id: 565fbb949c [formerly 5aee93d8db [formerly ebc45c13a3] [formerly 565fbb949c [formerly 5e749f9f2b1bddbb57d1e61d0211982db90656cd]]]
Former-commit-id: 5aee93d8db [formerly ebc45c13a3]
Former-commit-id: 5aee93d8db
Former-commit-id: ba48f6ee0c
|
2015-05-08 14:42:40 +00:00 |
|
Ron Anderson
|
938b39f979
|
Omaha #4467 Add support for mixedCase to runIFPText.
Change-Id: I69c063596d175ea89a2b4537722bdb1ff399cb55
Former-commit-id: c8be7b62d7 [formerly 29645d65c1 [formerly d897f85369] [formerly c8be7b62d7 [formerly 3cc39323a55aaec6b38356724d2949605d4fde37]]]
Former-commit-id: 29645d65c1 [formerly d897f85369]
Former-commit-id: 29645d65c1
Former-commit-id: 53b88ca18c
|
2015-05-06 13:17:08 -05:00 |
|
Fay.Liang
|
6dc1b3fa98
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 6dd4acc2c2 [formerly f28633c1d4 [formerly 5606e3cfa0] [formerly 6dd4acc2c2 [formerly 03e663afae6eb0998892e2921566652f42196e1f]]]
Former-commit-id: f28633c1d4 [formerly 5606e3cfa0]
Former-commit-id: f28633c1d4
Former-commit-id: 197a0d9316
|
2015-04-16 23:06:25 -04:00 |
|
Rici.Yu
|
782d8498c9
|
ASM #14946 - fix issue when timezone is not defined for any zone in a segment
Change-Id: I252f78cb9f5bf1cf556788c79fe14ad338b546aa
Former-commit-id: 03034f57c8 [formerly 524fa004d3 [formerly 3b59050996] [formerly 03034f57c8 [formerly ef4c5307d5693abd834f4210e081fb8e3a21f90b]]]
Former-commit-id: 524fa004d3 [formerly 3b59050996]
Former-commit-id: 524fa004d3
Former-commit-id: ac9c9f5aa9
|
2015-04-16 13:24:29 -04:00 |
|
Rici.Yu
|
bd75f30ced
|
ASM #17390 - Fix string/int conversion issue preventing BOIVerify from launching
Change-Id: I6c0a0ea22650a5b42b24b41e41e3ca0acabbf14b
Former-commit-id: c9337caeb2 [formerly c1511407bc [formerly c9955bce55] [formerly c9337caeb2 [formerly c6888b4aa86ed3425b5a016d2fbe5664763b4682]]]
Former-commit-id: c1511407bc [formerly c9955bce55]
Former-commit-id: c1511407bc
Former-commit-id: 8fee3a32f7
|
2015-04-16 10:51:23 -04:00 |
|
Fay.Liang
|
f99835d7e0
|
Merge tag 'OB_14.3.3-2' into master_14.4.1
14.3.3-2
Conflicts:
cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java
Former-commit-id: 618781f10c [formerly 8f3b4cb35a [formerly c8962caee7] [formerly 618781f10c [formerly f5fad51061f568aea4ea581a099ef8353758add6]]]
Former-commit-id: 8f3b4cb35a [formerly c8962caee7]
Former-commit-id: 8f3b4cb35a
Former-commit-id: 36f4f953cb
|
2015-04-06 15:40:31 -04:00 |
|
Rici.Yu
|
421a7260c4
|
ASM #17194 - convert SerpConfig.py from smart tool to utility
Change-Id: I8007ca1676de148aa42c5b15c8e3366bbe8c8e5d
Former-commit-id: 0492e66d87 [formerly 466b38d20d [formerly d47caf2552] [formerly 0492e66d87 [formerly 6968986c535bbadee8436cca5cfcc329d47c606b]]]
Former-commit-id: 466b38d20d [formerly d47caf2552]
Former-commit-id: 466b38d20d
Former-commit-id: df0b9d2d0c
|
2015-04-02 10:48:25 -04:00 |
|
Fay.Liang
|
a9fcfff9c7
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 53bdc83ba4 [formerly af80d5b682 [formerly f2e952b71a] [formerly 53bdc83ba4 [formerly dd741e026ef0599738bbbc82579a679b57feeef7]]]
Former-commit-id: af80d5b682 [formerly f2e952b71a]
Former-commit-id: af80d5b682
Former-commit-id: fb86bbc988
|
2015-03-19 17:18:52 -04:00 |
|
Paul Grell
|
02a10a9f16
|
Merge "Revert "Revert "ASM #17217 - GFE: default to smart formatter types""" into asm_14.4.1
Former-commit-id: f47e4fdcff [formerly 2d17527faa [formerly 81c34481c1] [formerly f47e4fdcff [formerly 60344f611d90d46fffcf2a05230670b72f303916]]]
Former-commit-id: 2d17527faa [formerly 81c34481c1]
Former-commit-id: 2d17527faa
Former-commit-id: 72b1a9ee64
|
2015-03-19 16:05:49 -05:00 |
|
Paul Grell
|
ba84a3ffc6
|
Revert "Revert "ASM #17217 - GFE: default to smart formatter types""
This reverts commit 659546f5eb [formerly f4920cc0b9] [formerly f31cdc6925] [formerly f31cdc6925 [formerly 2495ce971f]] [formerly b1d84d2964 [formerly f31cdc6925 [formerly 2495ce971f] [formerly b1d84d2964 [formerly 111f2d19b08ded3e5ab05406f475da8245af851f]]]].
Change-Id: I17493c7867a87fd53814fcc16c7e248a3ee7cddf
Former-commit-id: 3b71d36945 [formerly b36de51998 [formerly 07491fe499] [formerly 3b71d36945 [formerly 8c93f552b1af035c1de2f8d9ce71a82c85776afc]]]
Former-commit-id: b36de51998 [formerly 07491fe499]
Former-commit-id: b36de51998
Former-commit-id: bdf62a0cdd
|
2015-03-19 16:02:22 -05:00 |
|
Fay.Liang
|
b8be1444ef
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 475019fb61 [formerly 228e85dcb9 [formerly 0284b3b7e9] [formerly 475019fb61 [formerly e926e1c0160e7d40df41fbe1e6ec7dd7263ade3e]]]
Former-commit-id: 228e85dcb9 [formerly 0284b3b7e9]
Former-commit-id: 228e85dcb9
Former-commit-id: 15560cc42e
|
2015-03-18 15:12:56 -04:00 |
|
Paul Grell
|
c158978b50
|
Merge "Revert "ASM #17217 - GFE: default to smart formatter types"" into asm_14.4.1
Former-commit-id: 4b1cec4b99 [formerly d0daa26bdb [formerly b28a5d5350] [formerly 4b1cec4b99 [formerly 4601ad77a9e49efaf34d4563baddcdf61dbd5804]]]
Former-commit-id: d0daa26bdb [formerly b28a5d5350]
Former-commit-id: d0daa26bdb
Former-commit-id: 8f9ec5ac48
|
2015-03-18 10:44:10 -05:00 |
|
Paul Grell
|
659546f5eb
|
Revert "ASM #17217 - GFE: default to smart formatter types"
This reverts commit 68e65a8d75 [formerly 2b5a21a115] [formerly d5ca25bb18] [formerly d5ca25bb18 [formerly dc489dabe2]] [formerly 70e5e24941 [formerly d5ca25bb18 [formerly dc489dabe2] [formerly 70e5e24941 [formerly 81aea3167f21670d7b41eec5458a1f7d36edb36a]]]].
As requested by Matt Howard email, reverting to remove from build 14.4.1-19
Change-Id: I8517fa02f22089d1d8433007e85ffa5a38274294
Former-commit-id: b1d84d2964 [formerly f31cdc6925 [formerly 2495ce971f] [formerly b1d84d2964 [formerly 111f2d19b08ded3e5ab05406f475da8245af851f]]]
Former-commit-id: f31cdc6925 [formerly 2495ce971f]
Former-commit-id: f31cdc6925
Former-commit-id: f4920cc0b9
|
2015-03-18 09:36:12 -05:00 |
|
Rici.Yu
|
9b67c19298
|
ASM #17217 - Add fullStationID entry for table products
Change-Id: I6f68b499ce67a2c6b6bb9dad833b76e3c37d6847
Former-commit-id: 6a7fbec942 [formerly 26ae2cded5 [formerly 72af59fcb6] [formerly 6a7fbec942 [formerly a987fe4493e4e58618271fffb37a708185ed4139]]]
Former-commit-id: 26ae2cded5 [formerly 72af59fcb6]
Former-commit-id: 26ae2cded5
Former-commit-id: d602aa1fcd
|
2015-03-18 10:30:38 -04:00 |
|
Rici.Yu
|
68e65a8d75
|
ASM #17217 - GFE: default to smart formatter types
Change-Id: Ib831998a7293e61a5b606d03ef19f47b09f2e0d5
Former-commit-id: 70e5e24941 [formerly d5ca25bb18 [formerly dc489dabe2] [formerly 70e5e24941 [formerly 81aea3167f21670d7b41eec5458a1f7d36edb36a]]]
Former-commit-id: d5ca25bb18 [formerly dc489dabe2]
Former-commit-id: d5ca25bb18
Former-commit-id: 2b5a21a115
|
2015-03-17 11:26:37 -04:00 |
|
Fay.Liang
|
55e0d315e7
|
Merge tag 'OB_14.3.2-19m' into master_14.4.1
14.3.2-19m
Conflicts:
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 0e475cb704 [formerly a9945f1981 [formerly 059eb032b1] [formerly 0e475cb704 [formerly 4b3626307cf35ada45985c25cf062e7b857db764]]]
Former-commit-id: a9945f1981 [formerly 059eb032b1]
Former-commit-id: a9945f1981
Former-commit-id: 1138f48ee9
|
2015-03-09 16:11:13 -04:00 |
|
Shawn.Hooper
|
634780aa66
|
ASM #17178 - Update TCMWindTool to remove option for background Wind field
Change-Id: Ia299900784b9fe05a68ca25a74528abdc68a3f1f
Former-commit-id: 54d5553a93 [formerly a9a2bddc61 [formerly c0b675033a] [formerly 54d5553a93 [formerly bc4ec070e81298f7ed7312692a7f43cbd2d854ec]]]
Former-commit-id: a9a2bddc61 [formerly c0b675033a]
Former-commit-id: a9a2bddc61
Former-commit-id: b332c872ed
|
2015-03-05 12:58:44 -05:00 |
|
Fay.Liang
|
fa8f4e3332
|
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 1ed5d493fa [formerly 07c0347c3e [formerly f00b3d3156] [formerly 1ed5d493fa [formerly c91a37257cd2882047e79200f624acc1e0312cba]]]
Former-commit-id: 07c0347c3e [formerly f00b3d3156]
Former-commit-id: 07c0347c3e
Former-commit-id: 065ce3318a
|
2015-03-03 14:44:31 -05:00 |
|
Fay.Liang
|
1a881fbb38
|
Merge branch 'master_14.3.1.1' into master_14.3.2
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 9a4751b60e [formerly 97be252793 [formerly 8bfe8fb65f] [formerly 9a4751b60e [formerly 5aa2c444583d03b442768a8e9ea462877a25bb8d]]]
Former-commit-id: 97be252793 [formerly 8bfe8fb65f]
Former-commit-id: 97be252793
Former-commit-id: 548851cad0
|
2015-03-03 14:26:22 -05:00 |
|
Ana Rivera
|
a7268f3856
|
Merge "VLab Issue #6517 - TCMWindTool Fix; fixes #6517" into tcv_14.3.2
Former-commit-id: 5c19f14f0e [formerly f77e0ff965 [formerly 9fb3b29048] [formerly 5c19f14f0e [formerly 7746c8ce24f444d0d9b480e756d092b482e7428a]]]
Former-commit-id: f77e0ff965 [formerly 9fb3b29048]
Former-commit-id: f77e0ff965
Former-commit-id: 87e12ee70f
|
2015-03-02 22:19:14 +00:00 |
|
Ron Anderson
|
7392449eba
|
Omaha #4126 Ensure transmit is properly cancelled if dialog is closed
Change-Id: I259089abc4f4c9ce5cdfb80892273f7c0dd1ec65
Former-commit-id: ce87addfe4 [formerly 9203b33ee6 [formerly a4fea90f17] [formerly ce87addfe4 [formerly 781b6d4f32ec8e9d34d746db72aebab4d4153c56]]]
Former-commit-id: 9203b33ee6 [formerly a4fea90f17]
Former-commit-id: 9203b33ee6
Former-commit-id: 3f6421925f
|
2015-02-27 12:29:22 -06:00 |
|
Sarah Pontius
|
9d4503029f
|
VLab Issue #6517 - TCMWindTool Fix; fixes #6517
Change-Id: I986c425ecc57ab919f2b43ec6b1c4438e789cd86
Former-commit-id: 054762876e [formerly cda75a856f [formerly 8463da45e6] [formerly 054762876e [formerly 427c442c31ba87f6c20bdfe17abedceb90fb2e7a]]]
Former-commit-id: cda75a856f [formerly 8463da45e6]
Former-commit-id: cda75a856f
Former-commit-id: 97d82399b1
|
2015-02-25 13:51:44 -07:00 |
|
Ron Anderson
|
6dfa361df8
|
Issue #4099 Fix ETNs for products that span year-end.
(cherry picked from commit c7a8c9b049ae8d73ffb61765f31374e01d1d2a33)
Former-commit-id: ebb221d935 [formerly 34bc29be41 [formerly e19901c6e1] [formerly ebb221d935 [formerly 7ca4dd9ba059035e366807d4928768121fdd0712]]]
Former-commit-id: 34bc29be41 [formerly e19901c6e1]
Former-commit-id: 34bc29be41
Former-commit-id: 47f2095326
|
2015-02-24 12:09:29 -06:00 |
|
Ana Rivera
|
2a067edd59
|
VLab Issue #6566 - HTI: Update six scripts and one image; fixes #6566
Change-Id: I49052579740e22c54c0307d3787d9656bdf30bb5
Former-commit-id: d828b762ec [formerly 2525e00fb2 [formerly ccc338d7da] [formerly d828b762ec [formerly 2f9dd9b8422b899146f73da0a3d922b32b021152]]]
Former-commit-id: 2525e00fb2 [formerly ccc338d7da]
Former-commit-id: 2525e00fb2
Former-commit-id: a851bf4d13
|
2015-02-23 17:28:29 +00:00 |
|
Fay.Liang
|
bf8b28ca90
|
Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2
Former-commit-id: e0917a9f3f [formerly 57d91a0794 [formerly d15246d073] [formerly e0917a9f3f [formerly 10cc507489cc2ac649242ddfbe9791aee59c8890]]]
Former-commit-id: 57d91a0794 [formerly d15246d073]
Former-commit-id: 57d91a0794
Former-commit-id: e6811857b7
|
2015-02-19 16:40:21 -05:00 |
|
Rici.Yu
|
93546bfd36
|
ASM #17120 - retrieve practice products in non-operational mode
Change-Id: I2b76edaface7d185269e6e5ea5f032eeb3d4dab0
Former-commit-id: cc44f78fcf [formerly 13f179588f [formerly e62413c10b] [formerly cc44f78fcf [formerly 16dccf94319fbb3a617cc5e2360d0b0aa1c9cc9c]]]
Former-commit-id: 13f179588f [formerly e62413c10b]
Former-commit-id: 13f179588f
Former-commit-id: 05f098e4da
|
2015-02-19 10:48:19 -05:00 |
|
Sarah Pontius
|
531cb519b8
|
VLab Issue #6386 - HLS/TCV Beta Testing Changes; fixes #6386
Change-Id: Ica6e803b85c34e6d65fd268b844eaac06417909e
Former-commit-id: e4a1aa13f5 [formerly d9ffd6a710 [formerly 564febcc4a] [formerly e4a1aa13f5 [formerly 5fbb83dd042795e308ca8b6aa370e4f9b0fb3291]]]
Former-commit-id: d9ffd6a710 [formerly 564febcc4a]
Former-commit-id: d9ffd6a710
Former-commit-id: b011d89c00
|
2015-02-13 10:12:53 -07:00 |
|
Steve Harris
|
c0afbae473
|
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
14.4.1-10
Former-commit-id: 9311e6f440 [formerly e76330fac0 [formerly 3fe3d35339] [formerly 9311e6f440 [formerly 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2]]]
Former-commit-id: e76330fac0 [formerly 3fe3d35339]
Former-commit-id: e76330fac0
Former-commit-id: a2d87f74f7
|
2015-02-11 15:53:38 -06:00 |
|
Steve Harris
|
9440f8f584
|
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
14.4.1-10
Former-commit-id: c0afbae473 [formerly a2d87f74f7] [formerly e76330fac0] [formerly e76330fac0 [formerly 3fe3d35339]] [formerly c0afbae473 [formerly a2d87f74f7] [formerly e76330fac0] [formerly e76330fac0 [formerly 3fe3d35339]] [formerly 9311e6f440 [formerly e76330fac0 [formerly 3fe3d35339] [formerly 9311e6f440 [formerly 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2]]]]]
Former-commit-id: 9311e6f440
Former-commit-id: 8711ed280b [formerly f59cef1b7a] [formerly 300e3e50fe] [formerly cbf9f55c4e59cc5798a167b90d3f1418dfc870bd [formerly 9b94ac3d16cf083d4502b712efe3cac0bbc0889c] [formerly 300e3e50fe [formerly 6a2d5ec16d]]]
Former-commit-id: 0d71d4b865ca71f2864a593baff2a96eda233489 [formerly 28adc946fa3fbd5f3f87e0fa9e9c02ac79c68d1b] [formerly f2f6d56366 [formerly 07475d998f]]
Former-commit-id: f2f6d56366
Former-commit-id: 7718c17e3d
|
2015-02-11 15:53:38 -06:00 |
|
Fay.Liang
|
3b67540902
|
Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: 43c7161dcf [formerly e3107ce1e4 [formerly 59f3f87190] [formerly 43c7161dcf [formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]]]
Former-commit-id: e3107ce1e4 [formerly 59f3f87190]
Former-commit-id: e3107ce1e4
Former-commit-id: 4bcae42022
|
2015-02-09 17:19:41 -05:00 |
|
Fay.Liang
|
99fa038404
|
Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: 3b67540902 [formerly 4bcae42022] [formerly e3107ce1e4] [formerly e3107ce1e4 [formerly 59f3f87190]] [formerly 3b67540902 [formerly 4bcae42022] [formerly e3107ce1e4] [formerly e3107ce1e4 [formerly 59f3f87190]] [formerly 43c7161dcf [formerly e3107ce1e4 [formerly 59f3f87190] [formerly 43c7161dcf [formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]]]]]
Former-commit-id: 43c7161dcf
Former-commit-id: bd48ef892c [formerly ee6acc8fdd] [formerly 149102ec85] [formerly 583b51e7de21ae85d3bb60f293ea526038265229 [formerly 8b80e6a5ae948ea73931e17354298170ec9d226f] [formerly 149102ec85 [formerly 0b98fc8be6]]]
Former-commit-id: 1ebc4c5e9d2abcfe752452321aa4e29a59294579 [formerly 257ec8e3caf9807783d7f6b047aaa84560966ae3] [formerly 31607db1e1 [formerly 2d5858f8f0]]
Former-commit-id: e971de0fa7c7c16c8490a2e51f3ac9955601eff0 [formerly 31607db1e1]
Former-commit-id: 0b0f41fa37
|
2015-02-09 17:19:41 -05:00 |
|
Nate Jensen
|
13284bb63c
|
Omaha #4089 harden safety of numpy dtypes in gfe arrays
Change-Id: Ic77b459bc4d68930418ad66680ee86069c540c1f
Former-commit-id: ea273e14bf [formerly ac02fc3a81 [formerly b42dec0e4a] [formerly ea273e14bf [formerly ed77ff564520c8f6ad157dd115d37d69cbfab660]]]
Former-commit-id: ac02fc3a81 [formerly b42dec0e4a]
Former-commit-id: ac02fc3a81
Former-commit-id: baafc97b60
|
2015-02-05 18:03:47 -06:00 |
|
Nate Jensen
|
4f86ba0587
|
Omaha #4089 harden safety of numpy dtypes in gfe arrays
Change-Id: Ic77b459bc4d68930418ad66680ee86069c540c1f
Former-commit-id: 13284bb63c [formerly baafc97b60] [formerly ac02fc3a81] [formerly ac02fc3a81 [formerly b42dec0e4a]] [formerly 13284bb63c [formerly baafc97b60] [formerly ac02fc3a81] [formerly ac02fc3a81 [formerly b42dec0e4a]] [formerly ea273e14bf [formerly ac02fc3a81 [formerly b42dec0e4a] [formerly ea273e14bf [formerly ed77ff564520c8f6ad157dd115d37d69cbfab660]]]]]
Former-commit-id: ea273e14bf
Former-commit-id: 46632f6afc [formerly f4c1282505] [formerly eea6f68b54] [formerly ed9db26a3c05bf9a63580621594064e276b25316 [formerly 123f4e2c2f11c8383e8614ada84d951c57722452] [formerly eea6f68b54 [formerly 2346be4023]]]
Former-commit-id: 3680956ab7682c59539fabbb3ac07ce1ee96c31c [formerly 4726ca5f93aa0bbf0c3c85ce2a747d57a2fefa45] [formerly f20fb4afa8 [formerly e4edba9ee7]]
Former-commit-id: f20fb4afa8
Former-commit-id: 523c65000f
|
2015-02-05 18:03:47 -06:00 |
|
Rici.Yu
|
a5c75bc7a1
|
ASM #17039 - Remove HighlightFramingCodes feature
Change-Id: I7ee07ef64b1a16cdeb0b6af48ccaf3c228357891
Former-commit-id: 1188dab0f4 [formerly 0a489fea9c [formerly 5470139b42] [formerly 1188dab0f4 [formerly cb047745b4a5c523bd1ca26692c758d3e72d8ddc]]]
Former-commit-id: 0a489fea9c [formerly 5470139b42]
Former-commit-id: 0a489fea9c
Former-commit-id: 5ea106504c
|
2015-02-04 10:23:30 -05:00 |
|
Rici.Yu
|
2ce48422b0
|
ASM #17039 - Remove HighlightFramingCodes feature
Change-Id: I7ee07ef64b1a16cdeb0b6af48ccaf3c228357891
Former-commit-id: a5c75bc7a1 [formerly 5ea106504c] [formerly 0a489fea9c] [formerly 0a489fea9c [formerly 5470139b42]] [formerly a5c75bc7a1 [formerly 5ea106504c] [formerly 0a489fea9c] [formerly 0a489fea9c [formerly 5470139b42]] [formerly 1188dab0f4 [formerly 0a489fea9c [formerly 5470139b42] [formerly 1188dab0f4 [formerly cb047745b4a5c523bd1ca26692c758d3e72d8ddc]]]]]
Former-commit-id: 1188dab0f4
Former-commit-id: 1d7080c90e [formerly ee698f53ad] [formerly e1762b3ae9] [formerly 6192a6082351be4a501ad206038596f68e732198 [formerly 6da28c19a36ade277d972747bb7dd288cf026ad0] [formerly e1762b3ae9 [formerly f41d5cffef]]]
Former-commit-id: 16a529f6c208c1deda8dae3ae6dafee45d64d068 [formerly b96c2b573732c2570ee542113a6fab3a4c4d6573] [formerly 520899992d [formerly ff0177a6dd]]
Former-commit-id: 520899992d
Former-commit-id: 3b7f5cda16
|
2015-02-04 10:23:30 -05:00 |
|
Ron Anderson
|
5699e86af0
|
Merge "Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up." into omaha_14.4.1
Former-commit-id: 933590f36a [formerly 8c6c42fe43 [formerly f280c0ab2e] [formerly 933590f36a [formerly 170e3149e6cf9feb7a8ab0e2ac3ed0826b9f7b6c]]]
Former-commit-id: 8c6c42fe43 [formerly f280c0ab2e]
Former-commit-id: 8c6c42fe43
Former-commit-id: 292c9777a4
|
2015-02-02 15:04:51 -06:00 |
|
Ron Anderson
|
96eb5a4e9c
|
Merge "Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up." into omaha_14.4.1
Former-commit-id: 5699e86af0 [formerly 292c9777a4] [formerly 8c6c42fe43] [formerly 8c6c42fe43 [formerly f280c0ab2e]] [formerly 5699e86af0 [formerly 292c9777a4] [formerly 8c6c42fe43] [formerly 8c6c42fe43 [formerly f280c0ab2e]] [formerly 933590f36a [formerly 8c6c42fe43 [formerly f280c0ab2e] [formerly 933590f36a [formerly 170e3149e6cf9feb7a8ab0e2ac3ed0826b9f7b6c]]]]]
Former-commit-id: 933590f36a
Former-commit-id: 03ad8f6261 [formerly 5a873f87d5] [formerly cc882eae28] [formerly 1b66f135b72aec34f26c6d1950ad189baffed778 [formerly ef204f25ac9dde9f0e1bedc81cb36de22a062b37] [formerly cc882eae28 [formerly 074512f362]]]
Former-commit-id: 39fe9049efcb56e9170b755e699435af9c5e26e5 [formerly e0a40872c1ee10521c91a39a50f26b152adfe7b1] [formerly a3bfe3b090 [formerly fa9890db7a]]
Former-commit-id: 27d309206138622940f95f62612d78e223967864 [formerly a3bfe3b090]
Former-commit-id: 72fa5331da
|
2015-02-02 15:04:51 -06:00 |
|
Ron Anderson
|
39dd092f9e
|
Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up.
Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2
Former-commit-id: 346ea417ea [formerly 67443be919 [formerly bdc365d9c9] [formerly 346ea417ea [formerly 9d2f64b08acbec0567c7f29871480827ff0f6de7]]]
Former-commit-id: 67443be919 [formerly bdc365d9c9]
Former-commit-id: 67443be919
Former-commit-id: f9c31d4237
|
2015-02-02 11:26:59 -06:00 |
|
Ron Anderson
|
ad6e983bc5
|
Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up.
Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2
Former-commit-id: 39dd092f9e [formerly f9c31d4237] [formerly 67443be919] [formerly 67443be919 [formerly bdc365d9c9]] [formerly 39dd092f9e [formerly f9c31d4237] [formerly 67443be919] [formerly 67443be919 [formerly bdc365d9c9]] [formerly 346ea417ea [formerly 67443be919 [formerly bdc365d9c9] [formerly 346ea417ea [formerly 9d2f64b08acbec0567c7f29871480827ff0f6de7]]]]]
Former-commit-id: 346ea417ea
Former-commit-id: c6f50868b0 [formerly e5cd3a264a] [formerly d3bce10b61] [formerly 6d0bdf60ab6e2f8afe49063af9eb3bae53aa0baa [formerly 3c9e861b0a7046daf174da682957bacc3fc53825] [formerly d3bce10b61 [formerly 48c2f0e843]]]
Former-commit-id: 3613a3ebacfcf40a5c3e74fffa2fa44a8004c032 [formerly c05eab7f23451112b73da73fa553ce8d7c9a5fc5] [formerly 07ac450c18 [formerly 30824e2e86]]
Former-commit-id: 07ac450c18
Former-commit-id: eb7f457ff9
|
2015-02-02 11:26:59 -06:00 |
|
Steve Harris
|
676314920e
|
Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
14.4.1-5
Former-commit-id: bc3f196d48 [formerly 1cce5ed9ef [formerly 9927bac8ed] [formerly bc3f196d48 [formerly 6f10c0ebeb8956fd0d12f424ddd9b09bdc4b4021]]]
Former-commit-id: 1cce5ed9ef [formerly 9927bac8ed]
Former-commit-id: 1cce5ed9ef
Former-commit-id: 94c54c32b1
|
2015-01-28 12:57:55 -06:00 |
|
Steve Harris
|
71351d9970
|
Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
14.4.1-5
Former-commit-id: 676314920e [formerly 94c54c32b1] [formerly 1cce5ed9ef] [formerly 1cce5ed9ef [formerly 9927bac8ed]] [formerly 676314920e [formerly 94c54c32b1] [formerly 1cce5ed9ef] [formerly 1cce5ed9ef [formerly 9927bac8ed]] [formerly bc3f196d48 [formerly 1cce5ed9ef [formerly 9927bac8ed] [formerly bc3f196d48 [formerly 6f10c0ebeb8956fd0d12f424ddd9b09bdc4b4021]]]]]
Former-commit-id: bc3f196d48
Former-commit-id: 925b67b1db [formerly 2af61518e0] [formerly 8eadb10d1d] [formerly 40587f94152bab54adb52896a77d35bdbeb085c7 [formerly e6704952115602df0a1c863411cd291fdbec8386] [formerly 8eadb10d1d [formerly 690c18ae04]]]
Former-commit-id: a822bd40fa238aab08915797bf6c390310ef4f56 [formerly be8f3a2b2daa7a8bb5b089477096277faad8e57c] [formerly be1e949e33 [formerly e1df0f4767]]
Former-commit-id: be1e949e33
Former-commit-id: 0e92ae6b98
|
2015-01-28 12:57:55 -06:00 |
|