Steve Harris
4f4f417efb
Merge tag 'OB_15.1.1-18' into omaha_16.1.1
...
15.1.1-18
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
Former-commit-id: 383347accebb250ce3c761ad2e1cc0aaa58abde3
2015-06-16 09:35:56 -05:00
David Gillingham
bbcff29843
Omaha #4422 : Support ingest and display of NAM12 simulated satellite data in D2D and GFE.
...
Change-Id: Ic2afdc7d0d3487b5f9ee8faa4e44a0341c24eb88
Former-commit-id: 0e5a00548514123df7e2439e51878e492cdf3a6f
2015-06-15 17:02:01 -05:00
Fay.Liang
0fa6593639
Merge tag 'OB_14.4.1-50' into int_15.1.1
...
14.4.1-50
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
Former-commit-id: a2a24493e5015323a22fbce1b2cb7b28f81b9f9c
2015-06-11 17:12:14 -04:00
Rici.Yu
69a41f1a09
ASM #17487 - Fix gfeclient hanging due to lock file conflict
...
Change-Id: I8131c781d332135eaf9955fdf3e172b61c4e92da
Former-commit-id: d3c911a1f425a81d35ebd4184b626f256183206b
2015-06-08 16:27:47 -04:00
Nate Jensen
ab85e7a600
Omaha #4259 remove LD_PRELOAD usage
...
Change-Id: I978df385ae00bb4da280cb293d5b0d7f10467097
Former-commit-id: 29988362b0d24787c1b5910feb638fb8770e77d9
2015-06-08 11:10:42 -05:00
Steve Harris
4de63454fc
Merge tag 'OB_15.1.1-16' into omaha_16.1.1
...
15.1.1-16
Conflicts:
cave/com.raytheon.viz.gfe/build.properties
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore)
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc
2015-06-05 15:38:00 -05:00
Greg Armendariz
e6714a3e7a
Omaha #4343 - Resolve merge issue, add comma to separate manifest lines
...
Former-commit-id: ab8b5b3ce599719c099eae62d36a6c856cb6e21f
2015-06-04 12:10:18 -05:00
Steve Harris
7e7cdd1c7a
Merge tag 'OB_15.1.1-14' into omaha_16.1.1
...
15.1.1-14
Conflicts:
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Former-commit-id: 92470a2ce7952ee72dbe2557ee16ee54d7ae901c
2015-06-04 11:08:19 -05:00
Fay.Liang
a9a5aa6f70
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 6c8e5f9fba2f3f080287da9931dcbe1dee2545c6
2015-06-01 08:59:15 -04:00
Fay.Liang
f754ccb426
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into int_15.1.1
...
Former-commit-id: 904d90b1eb028c677b6f62f9a244aa7fd061fef6
2015-05-29 16:17:18 -04:00
Fay.Liang
31496dac17
Merge tag 'OB_14.4.1-47' into int_15.1.1
...
14.4.1-47
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 602505383d4a1ec8a2cea08f94b7350cabae39b7
2015-05-29 15:42:40 -04:00
Ying-Lian.Shi
aab21ae2f1
ASM #17500 GFE: Problem with CTAs for Heat Advisory (HT.Y) and Excessive Heat Warning (EH.W)
...
Change-Id: Ia5e8c7775deab23d689e7d9a987523536ff98e2b
Former-commit-id: e8cf281170f41e86c1d4bd643dbe92ee79b9adec
2015-05-29 18:18:08 +00:00
Ron Anderson
88d48b1360
Omaha #4467 Fix issue with unicode string from formatter
...
Change-Id: I4f5792953aef2bccecc7576d8282bcbd5d89671a
Former-commit-id: e95402f2b4bfef8bfb1de89b6ff58cf0e19a8daf
2015-05-27 15:28:29 -05:00
Fay.Liang
78e5fba897
Merge tag 'OB_14.3.4-2' into master_14.4.1
...
14.3.4-2
Former-commit-id: ab0f58ebd6b4ce61525b1ec768fb6b293098cd91
2015-05-22 14:52:28 -04:00
Ana Rivera
f7128dbcbe
VLab Issue #8326 -DR17492 TCStormSurgeThreat Update 2; fixes #8326
...
Change-Id: Idac35a7a2465257147f9e4fb3f5e70d7e3713192
Former-commit-id: 377a104856ac009f465a534e9cec03754d5c2272
2015-05-22 18:28:22 +00:00
Ana Rivera
43be56bfec
VLab Issue #8326 - DR17492 A new TCStormSurgeThreat procedure; fixes #8326
...
Change-Id: I70b38b4e6c21372a4522446e94e370e90e342334
Former-commit-id: bd4722e28a60504f610350ccc7c0b6eb9cd6898e
2015-05-21 23:30:28 +00:00
Ron Anderson
7d1886f84a
Omaha #4027 Fixes for GFE formatter auto tests
...
Change-Id: Ia59e2a7794f520538d056e2b4286d53b6317ab06
Former-commit-id: 093e1d721e130f690b15e821d6bb4f12f3b62913
2015-05-21 14:32:47 -05:00
Nate Jensen
811a0c43cd
Omaha #4509 added python time and dataaccess folders to include path
...
Change-Id: I377d742761e5043b240579ebcfb9a77b2a7118df
Former-commit-id: 846925e473072e6f5b9dcbfd2355e64c40627c4b
2015-05-20 18:19:34 -05:00
Steve Harris
9b3d8a8443
Merge tag 'OB_15.1.1-12' into omaha_16.1.1
...
15.1.1-12
Conflicts:
build/deploy.edex.awips2/esb/bin/setup.env
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.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/smartinit/Init.py
Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
2015-05-20 11:25:45 -05:00
Ron Anderson
a0a689c99d
Omaha #4027 Fix case of a couple of expected results
...
Change-Id: I066521c707d5b3f540d3d232f450a2a082e8180d
Former-commit-id: 52343f35781f39a9ad63a72d5f709d3d93a0279f
2015-05-20 08:29:02 -05:00
Steve Harris
8ab4f18b0d
Merge tag 'OB_15.1.1-12' into omaha_15.1.1
...
15.1.1-12
Former-commit-id: 31ae0154fe4ad36aefb84f0210ce72172a31a9c2
2015-05-19 17:00:31 -05:00
Ben Steffensmeier
bf1c165307
Omaha #4079 Move gridded image displays into core grid plugin.
...
Former-commit-id: 2bb93741be4be6559c4aad7027dc1935ebe264b4
2015-05-19 10:46:28 -05:00
David Lovely
80dc4c85d9
Omaha #4146 Bundled class files in a jar when unpacked.
...
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02
Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
2015-05-19 10:23:35 -05:00
Ben Steffensmeier
72d601a2a7
Omaha #4079 Extract core grid and point rendering capabilities.
...
Former-commit-id: a0caefe923b18859fd89cb36749b31e3b24eecbe
2015-05-15 13:55:10 -05:00
Ron Anderson
1fb20ebfb6
Omaha #4027 Fix Hazard_AQA formatter
...
Change-Id: I0ac47efce8c3023f1ddbcaefc1bcb7538cca5224
Former-commit-id: 56020a1ae788746f4a40c43d8478334a171706af
2015-05-14 17:44:14 -05:00
Ron Anderson
163ddea34e
Omaha #4027 Changes to match draft mixed case guidelines from Phase I
...
Change-Id: I2af2a2742f99c8a97976cafd451057b7e7137efe
Former-commit-id: b9d9063e56939b558eee3f64b65ddc28f6478c38
2015-05-14 14:58:07 -05:00
Fay.Liang
8cce7a082c
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
...
Former-commit-id: fb0b41ff7b119e80d81e028bd8a768d6df335cf3
2015-05-13 15:11:13 -04:00
Shawn.Hooper
003c528458
ASM #17024 - Merge up to 14.4.1-38 into 15.1.1-10
...
Change-Id: Id4091550082328ce8a682db5ddd1a133fb7a5d39
Former-commit-id: 721a43ed8a1c9fdd1e5c62827869a91a20bfb416
2015-05-12 11:30:23 -04:00
Ana Rivera
153619e7ff
VLab Issue #8116 - Modify WCOSS NWPS Run scripts to support a 3rd option; fixes; #8116
...
Change-Id: Icafd7505b59dc0bf3673c655ceff93c3fefb5176
Former-commit-id: a64386381a2543f3a01e418abc0ec36cc317fbeb
2015-05-11 18:07:25 +00:00
Ana Rivera
05090b3d96
Merge branch 'master_14.4.1'(OB_14.4.1-36) into emc_14.4.1
...
Change-Id: Ie153b2a36947fa999b47cde069c1915e371c3f98
Former-commit-id: 5abb5644ef50d32fe131941ea46c70f371ed9a3b
2015-05-11 16:55:58 +00:00
Fay.Liang
af1448c5d0
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 3fa21300bc62a687cd076b709e4df8f8bf508edc
2015-05-10 00:16:32 -04:00
Ana Rivera
565fbb949c
VLab Issue #8081 - Baseline NWPS Weather Element groups; fixes #8081
...
Change-Id: I901d43e6474cb659407b6bcf1e1798c7de2dc341
Former-commit-id: 5e749f9f2b1bddbb57d1e61d0211982db90656cd
2015-05-08 14:42:40 +00:00
Ron Anderson
6adb5f6dbc
Omaha #4027 Get GFE Formatter auto tests working with mixed case
...
Change-Id: I55c2b34adca1c049116682be5ff40509729e16c0
Former-commit-id: c214e6cc22140b53ac8bd5514913b63a0850867a
2015-05-07 14:41:49 -05:00
Nate Jensen
397fa4a07e
Omaha #4259 gfe changes for jep upgrade to 3.3
...
Change-Id: I5887537b7bcd05ea289fdd04851618264829987d
Former-commit-id: 83ba21f361e4c528115533ca72be8efd0109eb9d
2015-05-07 09:02:20 -05:00
Ron Anderson
c8be7b62d7
Omaha #4467 Add support for mixedCase to runIFPText.
...
Change-Id: I69c063596d175ea89a2b4537722bdb1ff399cb55
Former-commit-id: 3cc39323a55aaec6b38356724d2949605d4fde37
2015-05-06 13:17:08 -05:00
Steve Harris
23cb520937
Merge tag 'OB_15.1.1-8' into omaha_16.1.1
...
15.1.1-7
Conflicts (these files were moved to AWIPS2_baseline):
rpms/awips2.core/Installer.java/build.sh
rpms/awips2.core/Installer.java/common/scripts/profile.d/awips2Java.sh
Former-commit-id: df806c9479cb29a5f47f1511ad70e140b2bbf8ec
2015-05-05 15:24:22 -05:00
Steve Harris
0a7e5a4474
Merge tag 'OB_15.1.1-8' into omaha_15.1.1
...
15.1.1-7
Former-commit-id: 56bb5952e20c8ff817d1ca05b68bf9a8424f6df9
2015-05-05 13:33:32 -05:00
Steve Harris
815a30871b
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
Former-commit-id: c6156764c2c4fb068f994cbb17d1f373d75f7070
2015-05-05 09:19:28 -05:00
Shawn.Hooper
48e06c41ad
ASM #17024 - Merge tag 'OB_14.4.1-33' into MERGE-14.4.1-33
...
Merge 14.4.1-33 into 15.1.1-8
Change-Id: Iaebe94615f952be4b294aea0bcba04117b903e9c
Former-commit-id: 1f63e395c67afa5106bde7b96b72d4b3111221d3
2015-05-01 16:12:48 -04:00
Ron Anderson
095323cc32
Omaha #4027 Fixed hard coded active table mode in runFormatterScript
...
Change-Id: Ibf917114cff027fb0a24965dc4702dec62a780f8
Former-commit-id: be7645a58e3b8406727d7599e1f3ef5787705263
2015-04-30 15:29:01 -05:00
Ron Anderson
551d1bee91
Omaha #4027 More changes for Mixed Case
...
Change-Id: Id47f1c68877e8df0cbf84df09bdaa000a41a863e
Former-commit-id: 0e48bfe4de5c227ebf96b0b59f9c7a9c39415f2e
2015-04-29 13:18:27 -05:00
Fay.Liang
8ecc73d1f7
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Former-commit-id: 483383876bfe73eb58ec0eb314106288dab4d172
2015-04-27 14:08:47 -04:00
Shawn.Hooper
c03499c025
Merge branch 'master_15.1.1' into asm_15.1.1
...
Merges up to 15.1.1-7 back into the asm_15.1.1 branch.
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Change-Id: Ica098ffb233837e4fcb718e9c75a78de443eb267
Former-commit-id: 78b3f7a15c5d2ab60235f40f5236bbbbe58d28ce
2015-04-24 15:44:14 -04:00
Rici.Yu
220331599f
ASM #17340 - Fix clipping zone selector map to domain issue
...
Change-Id: Ie59580f02a6f145a5c23cb431ce042f2e25ac5a5
Former-commit-id: 5d7d7e956ce69945c5226dccca18942ba2052a80
2015-04-23 10:46:26 -04:00
Ron Anderson
0edd237aa7
Omaha #4027 More GFE changes for Mixed Case WA
...
Change-Id: Ia1b65979d442246984b1e281c902c9f078fa4848
Former-commit-id: 0eef8697e269644ec36c1c7f7b09610778beb4a1
2015-04-20 17:17:08 -05:00
Steve Harris
5932df4786
Merge tag 'OB_15.1.1-6' into omaha_16.1.1
...
15.1.1-5
Conflicts:
cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF
Former-commit-id: 97efa605a593b2ce6c9a9a97192ecc5223511e88
2015-04-20 08:09:45 -05:00
Fay.Liang
6dd4acc2c2
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: 03e663afae6eb0998892e2921566652f42196e1f
2015-04-16 23:06:25 -04:00
Rici.Yu
03034f57c8
ASM #14946 - fix issue when timezone is not defined for any zone in a segment
...
Change-Id: I252f78cb9f5bf1cf556788c79fe14ad338b546aa
Former-commit-id: ef4c5307d5693abd834f4210e081fb8e3a21f90b
2015-04-16 13:24:29 -04:00
Rici.Yu
c9337caeb2
ASM #17390 - Fix string/int conversion issue preventing BOIVerify from launching
...
Change-Id: I6c0a0ea22650a5b42b24b41e41e3ca0acabbf14b
Former-commit-id: c6888b4aa86ed3425b5a016d2fbe5664763b4682
2015-04-16 10:51:23 -04:00
Fay.Liang
6cd66bff93
Merge tag 'OB_14.4.1-25' into master_15.1.1
...
This merge includes all changes in 14.4.1-22, -23, -24, and -25
Conflicts:
cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.common.dataplugin.text/utility/common_static/base/mixedCase/mixedCaseProductIds.txt
Former-commit-id: 857d0d89ae214ccf53713f74ef6778ba80c637fe
2015-04-13 13:02:24 -04:00
