Steve Harris
663bf8c2f9
Merge tag 'OB_14.4.1-20m' into omaha_15.1.1
...
14.4.1-20m
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
edexOsgi/build.edex/esb/conf/logback.xml (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf)
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 165971a4f625bd3ee930
2015-03-26 09:57:17 -05:00
Ron Anderson
29b042d842
Merge "Omaha #4313 Updated Service Backup html help files for Multi-Site capability" into omaha_15.1.1
...
Former-commit-id: 0c3f6a11e8597c396e06
2015-03-25 16:45:35 -05:00
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: 76f8fd2cfe9208af09dc
2015-03-25 11:15:32 -05:00
Ron Anderson
020ad9a4e0
Omaha #4313 Updated Service Backup html help files for Multi-Site capability
...
Change-Id: I5d456a87ea651e377366c3826edacc29cfe38d5f
Former-commit-id: ade9cbdf611e82efdb12
2015-03-25 10:53:36 -05:00
Ron Anderson
3492f31889
Omaha #4300 Minor updates to the Service Backup Dialogs
...
Change-Id: I409be11a06ff181f184d22dea311c6b0a7e96cca
Former-commit-id: fdfd52e26c7aa3d76477
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: d21e1da9c0c975476243
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: 863082515f3fa5db60e5
2015-03-23 17:33:08 -05:00
Nate Jensen
f5a7b51767
Merge "Omaha #4278 try/catch throwables in dialog components" into omaha_15.1.1
...
Former-commit-id: 3cba1097d1e6f4a879a0
2015-03-23 16:41:12 -05:00
David Gillingham
2df75ee21c
Omaha #4103 : Save MHSID of failed site to ensure failed site grids are sent back to correct server.
...
Change-Id: Ibcb27a2c3005e209d4db8f5fe6d654b583e646a4
Former-commit-id: 46f607420163c77d96d1
2015-03-23 16:20:56 -05:00
Ron Anderson
ce7a673f30
Omaha #4300 Client-side changes for multi-site service backup
...
Change-Id: Ibcf05dfc67fa3824a5fe716e1d4038ad5aeb4034
Former-commit-id: 8c54ff2f61dcfd2c2e7c
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: b307b49e8141ae3a02b9
2015-03-23 13:19:27 -05:00
Fay.Liang
af80d5b682
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 53bdc83ba4f2e952b71a
2015-03-19 17:18:52 -04: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: a4d13dbabdfd5b270fdd
2015-03-19 16:13:56 -05:00
Paul Grell
2d17527faa
Merge "Revert "Revert "ASM #17217 - GFE: default to smart formatter types""" into asm_14.4.1
...
Former-commit-id: f47e4fdcff81c34481c1
2015-03-19 16:05:49 -05:00
Paul Grell
b36de51998
Revert "Revert "ASM #17217 - GFE: default to smart formatter types""
...
This reverts commit f31cdc69252495ce971fb1d84d29643b71d3694507491fe499
2015-03-19 16:02:22 -05:00
Richard Peter
26a5d3b599
Omaha #3959 - Fix subgrid bounds check
...
Change-Id: Ic8e47fbf38d333afe852afd92e9400787b8bca3b
Former-commit-id: 9faf691a3577b87f33b5
2015-03-18 14:40:47 -05:00
Fay.Liang
228e85dcb9
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 475019fb610284b3b7e9
2015-03-18 15:12:56 -04:00
Fay.Liang
6589cd8d6e
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 6b10ca734829adda74b3
2015-03-18 15:09:16 -04:00
Fay.Liang
fd502062c5
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 1c80edbed03b9e0864ab
2015-03-18 15:08:01 -04:00
Fay.Liang
8db78cb400
Merge ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 3233640aa26f8f2f5398
2015-03-18 14:54:46 -04:00
Lee Venable
3e358b78a4
Merge "Omaha #4234 remove code that doesn't work anyway" into omaha_15.1.1
...
Former-commit-id: 453426809fd3625bd704
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: f5e475170383d109e2cf
2015-03-18 11:50:10 -05:00
Paul Grell
d0daa26bdb
Merge "Revert "ASM #17217 - GFE: default to smart formatter types"" into asm_14.4.1
...
Former-commit-id: 4b1cec4b99b28a5d5350
2015-03-18 10:44:10 -05:00
Paul Grell
f31cdc6925
Revert "ASM #17217 - GFE: default to smart formatter types"
...
This reverts commit d5ca25bb18dc489dabe270e5e24941b1d84d29642495ce971f
2015-03-18 09:36:12 -05:00
Rici.Yu
26ae2cded5
ASM #17217 - Add fullStationID entry for table products
...
Change-Id: I6f68b499ce67a2c6b6bb9dad833b76e3c37d6847
Former-commit-id: 6a7fbec94272af59fcb6
2015-03-18 10:30:38 -04: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: 67b3a77c4f2fd5ba420f
2015-03-18 09:29:01 -05:00
Chip Gobs
78fb9921b2
VLab Issue #6997 MPE DR 17210 Post Analysis: Post Analysis App Failing with 14.3.1-53 Build ; fixes #6997
...
Former-commit-id: 4600aa594d28965a0276
2015-03-18 10:14:46 -04:00
Ron Anderson
c03a99a400
Omaha #3955 Fix error in TopoDatabase when GFE domain is changed
...
Change-Id: I0afbffb8b4e0ece19281f62c593b270cb138048c
Former-commit-id: 429d904d3ea4abe3ecc4
2015-03-17 16:32:42 -05:00
Chip Gobs
02c817fdfc
VLab Issue #6996 MPE DR 17209 Draw polygon fails on Substitution when field is blank.; fixes #6996
...
Former-commit-id: c112f01eab33a5c2021b
2015-03-17 16:28:29 -04:00
Chip Gobs
96e4320c0d
VLab Issue #6995 MPE DR 17208 PostAnalysis: Scale factor too large fixes #6995
...
Former-commit-id: 0976737cbbd09efd7da7
2015-03-17 13:30:54 -04:00
Sean.Webb
e1d042d9eb
Merge "ASM #17181 - Updated pqact.conf.template for MRMS, HRRR and ESTOFS" into asm_14.4.1
...
Former-commit-id: 2f02c8930581c58196f5
2015-03-17 11:42:37 -05:00
Dave Hladky
db56f95f96
Omaha #3888 found more un-safe nulls
...
Former-commit-id: 50344c998e708517862d
2015-03-17 11:12:59 -05:00
Sean.Webb
9918c8e476
ASM #17181 - Updated pqact.conf.template for MRMS, HRRR and ESTOFS
...
Change-Id: Ifd691a453dd201c04a297aa54068a9557b1b03e6
Former-commit-id: 506090817bada3710b7e
2015-03-17 11:31:56 -04:00
Rici.Yu
d5ca25bb18
ASM #17217 - GFE: default to smart formatter types
...
Change-Id: Ib831998a7293e61a5b606d03ef19f47b09f2e0d5
Former-commit-id: 70e5e24941dc489dabe2
2015-03-17 11:26:37 -04:00
Ron Anderson
b36d80f159
Omaha #3955 Fix null pointer in TopoDatabase when activating a new site
...
Change-Id: Ie1d558103a69eb6cb02629f3a3df961bf1955892
Former-commit-id: ec0ba7510a1dcbfb01d7
2015-03-16 11:34:07 -05:00
Jason Burks
e1e7f27857
VLab Issue #6926 - Moved LMA Menus to be in the lightning Menu; fixes #6926
...
Updated the based on feddback from Ben.
Change-Id: I2c400f98dc80ee2583818da26466fa9eac37f281
Former-commit-id: 3d3f3a6535dc59270db2
2015-03-14 14:36:37 +00: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: 6293139493e3f07916ea
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: 9353ac363a5e4cde5184
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: e4269dfba47a62d03b55
2015-03-13 15:58:28 -04:00
Chris Cody
dc86bbb54c
Omaha #4198 Add User Permissions for editting Hazard Services settings; Part 2
...
Change-Id: I05e61388f61d7069e791a2d9bbf11dea846cd0fc
Former-commit-id: e28ad12264796a8b1eb0
2015-03-13 14:44:02 -05: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: d4763501ce957278d1af
2015-03-13 09:44:50 -05:00
Richard Peter
b3add60cee
Merge "Omaha #4128 : Refactor ISC and active table sharing code so that their beans perform cluster failover together." into omaha_14.4.1
...
Former-commit-id: ca6249346d10811f4612
2015-03-12 20:03:41 -05:00
Ron Anderson
e652eefaf5
Omaha #4246 Changes to support VCModules at base, site, and user levels
...
Change-Id: I995ad5c185ec8c5f0056f28f7e2e1c5b5d7395fc
Former-commit-id: 6731ad420061cb550ad4
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: 2642cec7abf6300c62a7
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: 7bbd4b6a25fb6168d190
2015-03-12 16:23:37 -05:00
Richard Peter
ac3ccfd882
Merge "Omaha #4269 fix pypies logging process that was broken due to python 2.7.4 'fix' of http://bugs.python.org/issue14436 " into omaha_14.4.1
...
Former-commit-id: 5eec59c6bf41d6c509e7
2015-03-12 14:26:46 -05:00
Ron Anderson
a8fe8a6e4a
Omaha #3955 Fix regression that brok ViewWCL
...
Change-Id: Ib1ff4137004cff22ef94e8029bbc62875992252e
Former-commit-id: 370d0a0f700503bc3994
2015-03-12 12:58:00 -05:00
David Gillingham
e6512aa181
Omaha #4128 : Refactor ISC and active table sharing code so that their beans perform cluster failover together.
...
Change-Id: Ib97d20bdd26b413648727101da26fee8449cb7ba
Former-commit-id: e713928f7ccc99fbdb0a
2015-03-12 10:17:01 -05:00
Ron Anderson
8bc5f56bce
Omaha #4129 Fix server selection logic used by requestAT, requestTCV, and sendTCV
...
Change-Id: I1b31a05844e8a760d01bac57e2897bed28df198c
Former-commit-id: bf2ff2d80f9200772cff
2015-03-12 09:47:36 -05:00
Nate Jensen
191681a413
Omaha #4269 fix pypies logging process that was broken due to python
...
2.7.4 'fix' of http://bugs.python.org/issue14436
Change-Id: I496c1612eca0450f925ae0cd78dca9f28cd89d79
Former-commit-id: 8f19a358a820eb88b23a
2015-03-11 16:29:17 -05:00
