Ron Anderson
f435bea9a6
Merge "Omaha #4330 Changed feature order so nwsauth is installed before gfe on the Windows build." into omaha_15.1.1
...
Former-commit-id: 76f8fd2cfe
[formerly fc7526665ab854440eced0b03075fabc32f342df]
Former-commit-id: 9208af09dc
2015-03-25 11:15:32 -05:00
Ron Anderson
3492f31889
Omaha #4300 Minor updates to the Service Backup Dialogs
...
Change-Id: I409be11a06ff181f184d22dea311c6b0a7e96cca
Former-commit-id: fdfd52e26c
[formerly 6833a9db5bc8c0187ce999d8a7f310bcd4892ad2]
Former-commit-id: 7aa3d76477
2015-03-25 10:46:36 -05:00
David Lovely
84722234cf
Omaha #4330 Changed feature order so nwsauth is installed before gfe on the Windows build.
...
Former-commit-id: d21e1da9c0
[formerly 542a81d065c7ea5a991965967bf78faae253a029]
Former-commit-id: c975476243
2015-03-25 09:06:45 -05:00
Ron Anderson
120bd15d63
Merge "Omaha #4300 Client-side changes for multi-site service backup" into omaha_15.1.1
...
Former-commit-id: 863082515f
[formerly f6a14fd5ffa9a3629aae5a2d9a360b75bca31878]
Former-commit-id: 3fa5db60e5
2015-03-23 17:33:08 -05:00
Ron Anderson
ce7a673f30
Omaha #4300 Client-side changes for multi-site service backup
...
Change-Id: Ibcf05dfc67fa3824a5fe716e1d4038ad5aeb4034
Former-commit-id: 8c54ff2f61
[formerly 8daff8d5bb3e1bbf23a559671040cae4a03c9911]
Former-commit-id: dcfd2c2e7c
2015-03-23 16:08:31 -05:00
Nate Jensen
f9f99ef425
Omaha #4278 try/catch throwables in dialog components
...
Change-Id: Icb349774ff43ced32bdbf2cb9f21712589cfcfdb
Former-commit-id: b307b49e81
[formerly 9a78fb10bdbe14d77cf29442e1de8a1205c27b66]
Former-commit-id: 41ae3a02b9
2015-03-23 13:19:27 -05:00
David Gillingham
6323dea0be
Omaha #4103 : Update GFE service backup server code to support multiple service backup sites, use "smarter" lock files to store additional status.
...
NOTE: Service Backup features are broken until DR 4300 lands on this branch.
Change-Id: Ic0184c10c553187c8d0515f639c5a33fd3abde1f
Former-commit-id: a4d13dbabd
[formerly 732208b6600882a9ba9fcc0eefd7c8be0157beab]
Former-commit-id: fd5b270fdd
2015-03-19 16:13:56 -05:00
Lee Venable
3e358b78a4
Merge "Omaha #4234 remove code that doesn't work anyway" into omaha_15.1.1
...
Former-commit-id: 453426809f
[formerly b9e6d3d5d5eeb43136709f59a1e980919fa4b73f]
Former-commit-id: d3625bd704
2015-03-18 13:16:41 -05:00
Nate Jensen
7e101afc69
Omaha #4234 remove code that doesn't work anyway
...
Change-Id: I6747dcc1ccb3f7c3b424b996d63417f4a86a171b
Former-commit-id: f5e4751703
[formerly 26b21f4db52aa6dd802a5de460b98e1758bc6872]
Former-commit-id: 83d109e2cf
2015-03-18 11:50:10 -05:00
Steve Harris
31a6aa8107
Merge tag 'OB_14.4.1-18m' into omaha_15.1.1
...
14.4.1_18m
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 67b3a77c4f
[formerly 41217304fa68101d17e003b2fa6992d0e15b083c]
Former-commit-id: 2fd5ba420f
2015-03-18 09:29:01 -05:00
Fay.Liang
7997322bb4
Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 6293139493
[formerly 3b4b5c100cc6972beff6e22a609f069f97bdc765]
Former-commit-id: e3f07916ea
2015-03-13 16:03:02 -04:00
Fay.Liang
47076ba6b1
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 9353ac363a
[formerly ce42fe1d1c2ef5f664a522ec30fa91661b4aab3b]
Former-commit-id: 5e4cde5184
2015-03-13 15:59:02 -04:00
Fay.Liang
7873b16eac
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: e4269dfba4
[formerly ff4a350eca07ea0f158ca0c3082890faa5bda368]
Former-commit-id: 7a62d03b55
2015-03-13 15:58:28 -04:00
Nate Jensen
12b6a1bcad
Merge "Omaha #4204 ensure renamed bundle loads to tab name on next load" into omaha_15.1.1
...
Former-commit-id: d4763501ce
[formerly 017e83b7f5c36b0c672b80854049f17bff023b91]
Former-commit-id: 957278d1af
2015-03-13 09:44:50 -05:00
Ron Anderson
e652eefaf5
Omaha #4246 Changes to support VCModules at base, site, and user levels
...
Change-Id: I995ad5c185ec8c5f0056f28f7e2e1c5b5d7395fc
Former-commit-id: 6731ad4200
[formerly 33c2ab1111deb0ede6a3196d889475bc69dd63d4]
Former-commit-id: 61cb550ad4
2015-03-12 18:09:58 -05:00
Nate Jensen
0da7c51aa2
Omaha #4204 ensure renamed bundle loads to tab name on next load
...
Change-Id: Ie6e6ef3e40407b8baa0c733da89d738ed27b329b
Former-commit-id: 2642cec7ab
[formerly 5bc22166c63aea3b35f18aa0a5a82f6f26021ac2]
Former-commit-id: f6300c62a7
2015-03-12 17:51:53 -05:00
Ron Anderson
6dd691c77a
Omaha #3955 Additional updates to try to make the procedures more bulletproof.
...
Change-Id: Ie4c9d02c880dd460ef3470db9c68f5a67c0e924c
Former-commit-id: 7bbd4b6a25
[formerly 1ff0a8ab8715a780fdc14db7f81f1708567fdc78]
Former-commit-id: fb6168d190
2015-03-12 16:23:37 -05:00
Ron Anderson
a8fe8a6e4a
Omaha #3955 Fix regression that brok ViewWCL
...
Change-Id: Ib1ff4137004cff22ef94e8029bbc62875992252e
Former-commit-id: 370d0a0f70
[formerly 6af18dc2a364507481a119661f940aa420e379a9]
Former-commit-id: 0503bc3994
2015-03-12 12:58:00 -05:00
Tiffany Meyer
19f2e097ce
VLab Issue #6834 - MRMS Sub-gridding velocity patch; fixes #6834
...
Former-commit-id: df86b25aa9
[formerly 639a67e0ff96c5ea23613a75071017ecf86085c8]
Former-commit-id: 62b8b3a30c
2015-03-10 09:42:14 -05:00
Lee Venable
4822467496
Merge "Omaha #3856 - check if the timer is running when setting the icon in the timer action method." into omaha_15.1.1
...
Former-commit-id: f0b3a411c9
[formerly 2761ef3683f42ce3d6aa81915dea81c453f3aa44]
Former-commit-id: cbb92fa497
2015-03-10 09:05:23 -05:00
Steve Harris
2ce988ce9f
Merge tag 'OB_14.4.1-16m' into omaha_15.1.1
...
14.4.1-16m
Former-commit-id: 85b687be0b
[formerly 468600e9d5144873e5af1529ae0d38673e81bb17]
Former-commit-id: 379163b888
2015-03-09 18:54:39 -05:00
Lee Venable
1768579da3
Omaha #3856 - check if the timer is running when setting the icon in the timer action method.
...
Former-commit-id: 23a1acd019
[formerly ad840e023f40fe7d35bfeb21f1116d43bc06e472]
Former-commit-id: de65502fd1
2015-03-09 16:52:59 -05:00
Fay.Liang
a9945f1981
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 4b3626307cf35ada45985c25cf062e7b857db764]
Former-commit-id: 059eb032b1
2015-03-09 16:11:13 -04:00
David Friedman
dc25e9d8dd
ASM #17190 - Counties being listed twice in Zone based products with extra county entries in shapefile
...
Change-Id: Ie3cb35803e7ef08a4147d85c9a7f28b0476ce5a2
Former-commit-id: 3c45c2d158
[formerly 6d8bd3315f48d188507a76092a950511a75c142c]
Former-commit-id: cfb3788972
2015-03-09 14:23:35 +00:00
Evan Polster
c895a60ff5
VLab Issue #6773 ; Fixed problem where LAPS config file wasn't being persisted to the server; fixes #6773
...
Change-Id: I133973de6a129709a151313f090066b09bc4222e
Former-commit-id: 6b7bec9ce8
[formerly 948baed3df402f659cf9b80fd10a3bc3d9788036]
Former-commit-id: 0b5bb1291e
2015-03-06 23:07:47 +00:00
Shawn.Hooper
a9a2bddc61
ASM #17178 - Update TCMWindTool to remove option for background Wind field
...
Change-Id: Ia299900784b9fe05a68ca25a74528abdc68a3f1f
Former-commit-id: 54d5553a93
[formerly bc4ec070e81298f7ed7312692a7f43cbd2d854ec]
Former-commit-id: c0b675033a
2015-03-05 12:58:44 -05:00
Lee Venable
6c7f6a3010
Omaha #4183 - Fix exception handling in openWindows()
...
Former-commit-id: e3a4548d52
[formerly 11f7fbccade83be4c9e985bbf9a26a241fed8fe0]
Former-commit-id: 8c56eda100
2015-03-05 10:03:37 -06:00
Fay.Liang
7398f8fb7b
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 211d9bb8eb
[formerly 10b981ac5353585985f450b849006bd6514fe057]
Former-commit-id: aa2fa72260
2015-03-05 10:39:44 -05:00
Fay.Liang
13392d8181
Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: c5257a52c6
[formerly 1dc1cede71ab27d3339f396369827a6a89a8ad80]
Former-commit-id: 50bdaba08f
2015-03-05 10:33:36 -05:00
Steve Harris
38e5142819
Merge tag 'OB_14.4.1-15m' into omaha_15.1.1
...
Former-commit-id: 7fb303eff1
[formerly 4fe28e2a0013f77c8a04a56789fc4e101039d77f]
Former-commit-id: 4088396ba5
2015-03-04 21:06:10 -06:00
Nate Jensen
803d6e9c88
Omaha #4194 fix damage path issues
...
Change-Id: I0a8d08518590daa6e0f1c6c47437616cdeaddf17
Former-commit-id: 4147e78ef4
[formerly c2cf4add2f32c87ab26246c7a68420fa6df7b5a0]
Former-commit-id: b7a8f60ac1
2015-03-04 13:39:53 -06:00
Nathan Bowler
b090cd256a
Omaha #4189 Handle exceptions with var height graphs.
...
Change-Id: I1cef09db5fab7549826ee2cca1c8dc197d46751f
Former-commit-id: 2c1573ee37
[formerly 3deb18d135520687261ce7606725901146742f46]
Former-commit-id: 4c7732f81a
2015-03-04 10:27:45 -05:00
steve.naples
4dd189791e
ASM #15660 Fixed issues with saving disagg data.
...
Change-Id: I6f0e8b02b7035e9d9614c52718026fce81b2e331
Former-commit-id: 31a7909085
[formerly 4646f7396153651359624f3dd12660810fe2bf6e]
Former-commit-id: 3ecaf0c634
2015-03-03 21:02:54 +00:00
Fay.Liang
07c0347c3e
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 c91a37257cd2882047e79200f624acc1e0312cba]
Former-commit-id: f00b3d3156
2015-03-03 14:44:31 -05:00
Nate Jensen
e892a5cf39
Merge "Omaha #4204 enable renaming tabs in D2D" into omaha_15.1.1
...
Former-commit-id: bca5cc3108
[formerly 5b85c83ed1bd08931460ee0e615d495f1e3a33b2]
Former-commit-id: 4ab30a9215
2015-03-03 13:38:07 -06:00
Fay.Liang
97be252793
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 5aa2c444583d03b442768a8e9ea462877a25bb8d]
Former-commit-id: 8bfe8fb65f
2015-03-03 14:26:22 -05:00
Lee Venable
b4e450f820
Omaha #3856 - cancel job when the timer cancels
...
Former-commit-id: 7b2b9a82c1
[formerly 0b18a65df9bc2c26e75888d82979fb80a76862be]
Former-commit-id: 21d7202895
2015-03-02 18:57:35 -06:00
Nate Jensen
45857f7104
Omaha #4204 enable renaming tabs in D2D
...
Change-Id: I93e4c295de065fafcbf1b141b2f05f1e0cf72b5d
Former-commit-id: b463397eeb
[formerly df882fd2dd2f767a03dd24cf3b2de35624e91ed0]
Former-commit-id: 29c136fb95
2015-03-02 18:43:23 -06:00
Ana Rivera
f77e0ff965
Merge "VLab Issue #6517 - TCMWindTool Fix; fixes #6517 " into tcv_14.3.2
...
Former-commit-id: 5c19f14f0e
[formerly 7746c8ce24f444d0d9b480e756d092b482e7428a]
Former-commit-id: 9fb3b29048
2015-03-02 22:19:14 +00:00
Steve Harris
614966a758
Merge tag 'OB_14.4.1-14m' into omaha_15.1.1
...
14.4.1-14
Former-commit-id: ead97f053e
[formerly cdca3c5b9eb65bed9d773019917245d1000d78dd]
Former-commit-id: 07363394a1
2015-03-02 10:58:40 -06:00
Steven Harris
4ae60f470a
Merge tag 'OB_14.4.1-14m' into omaha_14.4.1
...
14.4.1-14
Former-commit-id: 318afb44dc
[formerly bf4f8eca3dfd48957a84a8594ea6aa02b77dc700]
Former-commit-id: 84804cf7c6
2015-03-02 09:25:54 -06:00
Fay.Liang
267928c10b
Merge branch 'asm_14.3.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1.1
...
Former-commit-id: 0d3078ace9
[formerly f07eab6e1ccf6737cb90dc9af5ac247807124158]
Former-commit-id: 185feac0e0
2015-03-02 09:29:39 -05:00
Shawn.Hooper
daddc33728
ASM #17172 - Update heap size to 1536M for 14.3.1.1 64-bit
...
Change-Id: Iea8841e91a5d4ea005fecd0e89cd55d67319db1c
Former-commit-id: a28a9e18b0
[formerly c96e25664a8ef82f33bbad3ea82efad90024baee]
Former-commit-id: ef3fe69c5f
2015-02-27 14:17:34 -05:00
Ron Anderson
9203b33ee6
Omaha #4126 Ensure transmit is properly cancelled if dialog is closed
...
Change-Id: I259089abc4f4c9ce5cdfb80892273f7c0dd1ec65
Former-commit-id: ce87addfe4
[formerly 781b6d4f32ec8e9d34d746db72aebab4d4153c56]
Former-commit-id: a4fea90f17
2015-02-27 12:29:22 -06:00
Richard Peter
008dde0ec5
Omaha #3353 - Fix warngen geometry generation blocking cave
...
Change-Id: I3c29747e0d9f0f265fbdab4e152b1739c42e26d0
Former-commit-id: 6224457b6e
[formerly 62410b8ce728440326997eab37a37a9650e51223]
Former-commit-id: cc3d526f60
2015-02-26 16:45:18 -06:00
Greg Armendariz
465da92660
Omaha #3299 - Add back correct jars, update deploy-install to search for plugins in optionaldirectories
...
Change-Id: I5aebad06117f7072d322b8d7cbfe4a14acc2fdf8
Former-commit-id: 9d95e79cd7
[formerly 3a09dc91fbeb7db16a99116ad2582932e3fd6e58]
Former-commit-id: 7539d84bba
2015-02-26 14:03:17 -06:00
Fay.Liang
fcd6e64aed
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: ab02834301
[formerly f784dc11199f557d0bd39181d3e55bfa2b06a42a]
Former-commit-id: fa65e0ecc9
2015-02-26 13:41:37 -05:00
Fay.Liang
310450e968
Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 7a25728a83
[formerly 4e3fc06b752911badc86f6a1b72ad177863378ed]
Former-commit-id: ba56127604
2015-02-26 13:36:56 -05:00
Shawn.Hooper
2255c32cfc
ASM #17175 - Increase the JVM heap size to 2560M for I-met client
...
Change-Id: I88c6a9a40b2145d9dd013b7c78d22af57fd7d987
Former-commit-id: f36dce4f91
[formerly cdc6bacc3b8b162a90b0ec8921b6805d77bccf23]
Former-commit-id: b5224e393c
2015-02-26 13:18:14 -05:00
Nate Jensen
5d8b9f55e6
Merge "Omaha #3299 - Updated deploy-install to find features" into omaha_14.4.1
...
Former-commit-id: ad82097a9e
[formerly 338968eebfe41680949dc39b60696e2fdc9f96c1]
Former-commit-id: 601df7e202
2015-02-26 09:28:55 -06:00