Steve Harris
165971a4f6
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: 0db97a3cefc6f709d336883202e51f1d5255ad75
2015-03-26 09:57:17 -05:00
Ron Anderson
863082515f
Merge "Omaha #4300 Client-side changes for multi-site service backup" into omaha_15.1.1
...
Former-commit-id: f6a14fd5ffa9a3629aae5a2d9a360b75bca31878
2015-03-23 17:33:08 -05:00
David Gillingham
46f6074201
Omaha #4103 : Save MHSID of failed site to ensure failed site grids are sent back to correct server.
...
Change-Id: Ibcb27a2c3005e209d4db8f5fe6d654b583e646a4
Former-commit-id: 72fb51b09d54160362c0c0d699bacca7cea49634
2015-03-23 16:20:56 -05:00
Ron Anderson
8c54ff2f61
Omaha #4300 Client-side changes for multi-site service backup
...
Change-Id: Ibcf05dfc67fa3824a5fe716e1d4038ad5aeb4034
Former-commit-id: 8daff8d5bb3e1bbf23a559671040cae4a03c9911
2015-03-23 16:08:31 -05:00
David Gillingham
a4d13dbabd
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: 732208b6600882a9ba9fcc0eefd7c8be0157beab
2015-03-19 16:13:56 -05:00
Richard Peter
9faf691a35
Omaha #3959 - Fix subgrid bounds check
...
Change-Id: Ic8e47fbf38d333afe852afd92e9400787b8bca3b
Former-commit-id: ef7f5baa159e83540f16c4d8908ccd9c85668688
2015-03-18 14:40:47 -05:00
Fay.Liang
1c80edbed0
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: ec7875e9a4bec3752aeb8442fca15e4e4fd02571
2015-03-18 15:08:01 -04:00
Fay.Liang
3233640aa2
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: 42d435f739134ec29a021415ed96b6c3406fc021
2015-03-18 14:54:46 -04:00
Steve Harris
67b3a77c4f
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: 41217304fa68101d17e003b2fa6992d0e15b083c
2015-03-18 09:29:01 -05:00
Ron Anderson
429d904d3e
Omaha #3955 Fix error in TopoDatabase when GFE domain is changed
...
Change-Id: I0afbffb8b4e0ece19281f62c593b270cb138048c
Former-commit-id: 1689d4433750ac388e9fe1f43b15545a7c398cbe
2015-03-17 16:32:42 -05:00
Ron Anderson
ec0ba7510a
Omaha #3955 Fix null pointer in TopoDatabase when activating a new site
...
Change-Id: Ie1d558103a69eb6cb02629f3a3df961bf1955892
Former-commit-id: 1352570da1c69350a61b760ff0fe9829056dd5e1
2015-03-16 11:34:07 -05:00
Jason Burks
3d3f3a6535
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: 56d2ffeaf8564c8ea02f52ef35e8aebea2e9f992
2015-03-14 14:36:37 +00:00
Fay.Liang
6293139493
Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 3b4b5c100cc6972beff6e22a609f069f97bdc765
2015-03-13 16:03:02 -04:00
Fay.Liang
e4269dfba4
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: ff4a350eca07ea0f158ca0c3082890faa5bda368
2015-03-13 15:58:28 -04:00
Chris Cody
e28ad12264
Omaha #4198 Add User Permissions for editting Hazard Services settings; Part 2
...
Change-Id: I05e61388f61d7069e791a2d9bbf11dea846cd0fc
Former-commit-id: 62ffd525226a1cc5fe7f57c332d998e11c206417
2015-03-13 14:44:02 -05:00
Richard Peter
ca6249346d
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: 99f2b2f693e2e30903399ffc94a7f4d6a84e0fed
2015-03-12 20:03:41 -05:00
Ron Anderson
6731ad4200
Omaha #4246 Changes to support VCModules at base, site, and user levels
...
Change-Id: I995ad5c185ec8c5f0056f28f7e2e1c5b5d7395fc
Former-commit-id: 33c2ab1111deb0ede6a3196d889475bc69dd63d4
2015-03-12 18:09:58 -05:00
Ron Anderson
7bbd4b6a25
Omaha #3955 Additional updates to try to make the procedures more bulletproof.
...
Change-Id: Ie4c9d02c880dd460ef3470db9c68f5a67c0e924c
Former-commit-id: 1ff0a8ab8715a780fdc14db7f81f1708567fdc78
2015-03-12 16:23:37 -05:00
David Gillingham
e713928f7c
Omaha #4128 : Refactor ISC and active table sharing code so that their beans perform cluster failover together.
...
Change-Id: Ib97d20bdd26b413648727101da26fee8449cb7ba
Former-commit-id: d242c9cc22d53dca873e62787f6ab3234dd2b7df
2015-03-12 10:17:01 -05:00
Ron Anderson
bf2ff2d80f
Omaha #4129 Fix server selection logic used by requestAT, requestTCV, and sendTCV
...
Change-Id: I1b31a05844e8a760d01bac57e2897bed28df198c
Former-commit-id: fb32cc53c476d64368e1a9b607e8b2a8e21dfb2c
2015-03-12 09:47:36 -05:00
Nate Jensen
e1536e8a6e
Omaha #4234 initialize the main python interpreter on a different thread
...
than the sub-interpreters, or warn when that happens
Change-Id: Id4d2c2401c96f6d884e5c468419f2d5893f6eafd
Former-commit-id: 5386e7fabcfbac366bb5335f601bcd0719b4f32c
2015-03-10 15:41:32 -05:00
Michael Gamazaychikov
12304947c6
ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
...
Change-Id: I7b0f6b3974e8a8e4072fa530dce7443a9d85244a
Former-commit-id: a437417c6a07fc069e194cd08d515c6984d15616
2015-03-10 13:18:09 -04:00
Tiffany Meyer
df86b25aa9
VLab Issue #6834 - MRMS Sub-gridding velocity patch; fixes #6834
...
Former-commit-id: 639a67e0ff96c5ea23613a75071017ecf86085c8
2015-03-10 09:42:14 -05:00
Steve Harris
85b687be0b
Merge tag 'OB_14.4.1-16m' into omaha_15.1.1
...
14.4.1-16m
Former-commit-id: 468600e9d5144873e5af1529ae0d38673e81bb17
2015-03-09 18:54:39 -05:00
Fay.Liang
0e475cb704
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: 4b3626307cf35ada45985c25cf062e7b857db764
2015-03-09 16:11:13 -04:00
Steve Harris
62527097b4
Merge tag 'OB_14.4.1-16m' into omaha_14.4.1
...
14.4.1-16m
Former-commit-id: ed67f8932f910a858b32b503fc8009e39dac03ab
2015-03-09 11:39:50 -05:00
Lee Venable
0268b22c0f
Omaha #4169 - additional fixes found during testing
...
Former-commit-id: 567ee994f3529f03231ff014d4604938f75837e4
2015-03-06 09:38:08 -06:00
Richard Peter
e0ff8b49c1
Omaha #3959 - Make subgridding grid based.
...
Change-Id: If1970961641536655fd1a951c0e433dbaca0687c
Former-commit-id: c3b5f78811d231009dad7533fd650a68634e3e29
2015-03-05 16:13:41 -06:00
Richard Peter
fcd83f4f64
Merge "Omaha #4161 fixed keystoreUtil script, Fixed goessounding race condition at startup, Fixed max-web server threags Jetty 8.1.15 bug" into omaha_14.4.1
...
Former-commit-id: 12f2bf58f6e9db21ab17723a1597fb3f1b3d97a5
2015-03-05 12:15:17 -06:00
Ron Anderson
8a51d088bc
Merge "Omaha #4128 : Fix NullPointerException in FetchActiveTableSrv.preStop()." into omaha_14.4.1
...
Former-commit-id: 4100c8f8d3f05a47676f2a5a7ee0bcf4d0151733
2015-03-05 11:52:13 -06:00
Fay.Liang
51cce67ca8
Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2
...
Former-commit-id: cbed951a6854af1afe4e4e1d14bedfda1534b21f
2015-03-05 12:48:18 -05:00
Lee Venable
261f55fdb2
Omaha #4169 - Fix error handling in getDatabase
...
Former-commit-id: e6cd36ecd1be2f80b82f92686cc18762c5e322a6
2015-03-05 11:46:27 -06:00
David Gillingham
154e56e186
Omaha #4128 : Fix NullPointerException in FetchActiveTableSrv.preStop().
...
Change-Id: I52f7181d2e6585f4e1b84e949212324d308529cc
Former-commit-id: 92b8782bb0c874e78e00d848c71c8140ff71e6ac
2015-03-05 10:08:14 -06:00
Fay.Liang
bafd1eb2db
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: c127d4bd2f42a22d91e9a0517a6d0e8b17198d6b
2015-03-05 10:41:04 -05:00
Fay.Liang
211d9bb8eb
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 10b981ac5353585985f450b849006bd6514fe057
2015-03-05 10:39:44 -05:00
Ron Anderson
893de08048
Omaha #4129 Fix exception handling on subprocess calls in IrtServer.py
...
Change-Id: Id0923f0ee4ae61f45df6f336fc856e8d27897990
Former-commit-id: 30bfaf9432481328ed9d23ef56568a857cf775c7
2015-03-05 08:56:48 -06:00
Steve Harris
7fb303eff1
Merge tag 'OB_14.4.1-15m' into omaha_15.1.1
...
Former-commit-id: 4fe28e2a0013f77c8a04a56789fc4e101039d77f
2015-03-04 21:06:10 -06:00
Ron Anderson
e08d469768
Merge "Omaha #4129 Log active table changes from ingestAT" into omaha_14.4.1
...
Former-commit-id: eaecbaa0b66153b43bfe59f96c43a1876b9e235f
2015-03-04 16:06:41 -06:00
Ron Anderson
1b2258ed00
Omaha #4129 Log active table changes from ingestAT
...
Change-Id: I19dee195785363bba0008419fbf156b2d74cf6dc
Former-commit-id: 009e56509930c8fdf2eacd250903260a13a6f3ca
2015-03-04 15:37:22 -06:00
Dave Hladky
63322de483
Omaha #4161 fixed keystoreUtil script, Fixed goessounding race condition at startup, Fixed max-web server threags Jetty 8.1.15 bug
...
Former-commit-id: d734262db63974de8bb846df63942596d06b24c1
2015-03-04 14:11:51 -06:00
Shawn.Hooper
08f7a7ef1c
ASM #16946 - Update typo from dateFile to dataFile
...
Change-Id: I1e18426806b0a6e1cb2ef1bbf5c003e5a8a8e1c2
Former-commit-id: 13fbcbd0a2cb70228a47d63839640c7612caaa2a
2015-03-04 14:07:01 -05:00
Nate Jensen
939ac73a13
Omaha #3978 fix http ebxml thrift service
...
Change-Id: I50e57fcafd472cbfd72fc911e863e118a62ab5ba
Former-commit-id: 6fca25e457989f4757999cfcce40ff9a3b1fc393
2015-03-03 17:20:25 -06:00
David Gillingham
46e371f7e6
Omaha #4128 : Ensure active table sharing is configured before enabling it.
...
Change-Id: Ib42a251f5d9c134da7ba484582ce60d653a06937
Former-commit-id: 3ebb60db47fc74a77eea56ae7738b5f7b405fb19
2015-03-03 16:46:39 -06:00
Ron Anderson
c50e75314f
Merge "Omaha #4128 : Move FetchActiveTableSrv to edex.gfe plugin, fix cluster failover of service." into omaha_14.4.1
...
Former-commit-id: 3ccb7a96f716bf5cd829a8f34a93dbc6744f3d1b
2015-03-03 15:59:42 -06:00
Nate Jensen
ed01615df2
Merge "Omaha #4180 Implement getAvailableParameters() for FFMP retrieval through DAF" into omaha_15.1.1
...
Former-commit-id: 965d2228d13643b698d3b5f6317ff249492a060f
2015-03-03 14:30:28 -06:00
Fay.Liang
1ed5d493fa
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: c91a37257cd2882047e79200f624acc1e0312cba
2015-03-03 14:44:31 -05:00
Nate Jensen
986a4ab27d
Merge "Omaha #4198 Add User Permissions for editting Hazard Services settings" into omaha_15.1.1
...
Former-commit-id: d895afc56c07ef6efb2afaef569076a1a802b275
2015-03-03 13:43:22 -06:00
Fay.Liang
9a4751b60e
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: 5aa2c444583d03b442768a8e9ea462877a25bb8d
2015-03-03 14:26:22 -05:00
Michael Gamazaychikov
9db91abd8a
ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
...
Change-Id: I5772661758a26c47019c3939ceff73ca0eb6f50e
Former-commit-id: ab0f7f0f627ab3926a219940f1267dc460e74e14
2015-03-03 09:38:34 -05:00
cmadmin
fc5e9ad8e2
Merge "Omaha #3299 - Remove fits plugin from awips2-edex-cots feature" into omaha_14.4.1
...
Former-commit-id: c0686acd33a35fdbca17dcc0255826a0e10c74d8
2015-03-02 14:12:07 -06:00
