Fay.Liang
3bd4d76143
Merge tag 'OB_14.4.1-20m' into master_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
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: 1d282a64da2998d91040a7c97f2e81beea0a8da4
2015-03-30 14:28:30 -04:00
Fay.Liang
009fd8a059
Merge branch 'ops_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 5879ba157369936274e88800e4f178e67567de95
2015-03-19 12:45:22 -04:00
Fay.Liang
9a12a4bca3
Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
...
Former-commit-id: 391ff6c59e4db20b42ea5ff52d7b37f4f49fc714
2015-03-19 12:41:59 -04:00
Fay.Liang
2eb8777058
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/build.edex/edex/common.properties
Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04:00
Fay.Liang
3b9e0864ab
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
6f8f2f5398
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
Melissa Porricel
7db813d59c
ASM #7951 - Add Capabilities for CONUS RTMA at 2.5km
...
Change-Id: Iab79fc17b3b648ffa39c8385c581392e3cf58f9c
Former-commit-id: 9c7d466213eaac3a46fddf416967d00e3446bfee
2015-03-16 17:14:56 -04:00
Jason Burks
dc59270db2
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
e3f07916ea
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
7a62d03b55
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
Kenneth Sperow
7383b52812
Merge remote branch 'origin/omaha_15.1.1' into field_15.1.1
...
Conflicts:
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
Former-commit-id: 71473bbe9463dee8f0077d13dd25dfcee3b5e4f4
2015-03-13 11:40:02 -07:00
Richard Peter
10811f4612
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
David Gillingham
cc99fbdb0a
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
9200772cff
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
Juliya Dynina
9e665591fc
Merge "ASM #14542 - Add HPCGuide wxType" into asm_15.1.1
...
Former-commit-id: 572a064333efc1264e2ff26b20a258b968bad686
2015-03-11 08:11:19 -05:00
Michael Gamazaychikov
24d10369ab
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
Matthew Howard
8e4516f9e3
Merge "ASM #14920 - GFE: Smartinits not calculating 12hr PoP correctly" into asm_15.1.1
...
Former-commit-id: 1d32e7e33c5d6fed4bc3c393cc25b31e528ba6a7
2015-03-10 11:26:52 -05:00
Tiffany Meyer
62b8b3a30c
VLab Issue #6834 - MRMS Sub-gridding velocity patch; fixes #6834
...
Former-commit-id: 639a67e0ff96c5ea23613a75071017ecf86085c8
2015-03-10 09:42:14 -05:00
Steve Harris
379163b888
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
059eb032b1
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
Bruce.Hundermark
f1772fc7e2
ASM #14920 - GFE: Smartinits not calculating 12hr PoP correctly
...
Change-Id: Ic8f63277a4b322e4908bbfe6fd32c28ffd3b1d24
Former-commit-id: 5c2d02a67bd5b4594c6d90afcbae4e8159e0edd1
2015-03-09 19:14:36 +00:00
Melissa Porricel
2c5d5defa8
ASM #14542 - Add HPCGuide wxType
...
Change-Id: Ie42a870c8bfede85cf00bb1d71a68f9fe4bafc1d
Former-commit-id: 1f1fe776f013990637d04f168c6c3df22aeb01fb
2015-03-09 12:48:02 -04:00
Steve Harris
b5f51e446c
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
bcb6be24b1
Omaha #4169 - additional fixes found during testing
...
Former-commit-id: 567ee994f3529f03231ff014d4604938f75837e4
2015-03-06 09:38:08 -06:00
Matthew Howard
e3ed34665c
Merge "ASM #13961 - GFE: ISC_Discrepancies tool creates unnecessary alarms" into asm_15.1.1
...
Former-commit-id: a6b75c99bbe24a3b84b4a7d8b7dde3aacee7549a
2015-03-06 09:52:21 -05:00
Richard Peter
9df7d7e987
Omaha #3959 - Make subgridding grid based.
...
Change-Id: If1970961641536655fd1a951c0e433dbaca0687c
Former-commit-id: c3b5f78811d231009dad7533fd650a68634e3e29
2015-03-05 16:13:41 -06:00
Richard Peter
4934064003
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
d2d0d0f573
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
97d25e8c8b
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
85cb3f5622
Omaha #4169 - Fix error handling in getDatabase
...
Former-commit-id: e6cd36ecd1be2f80b82f92686cc18762c5e322a6
2015-03-05 11:46:27 -06:00
David Gillingham
3fc30a2584
Omaha #4128 : Fix NullPointerException in FetchActiveTableSrv.preStop().
...
Change-Id: I52f7181d2e6585f4e1b84e949212324d308529cc
Former-commit-id: 92b8782bb0c874e78e00d848c71c8140ff71e6ac
2015-03-05 10:08:14 -06:00
Fay.Liang
2cdb454dc0
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
aa2fa72260
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
0f7f415204
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
4088396ba5
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
a6167718b2
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
3468d2ee60
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
e958125848
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
f3f48cf71f
ASM #16946 - Update typo from dateFile to dataFile
...
Change-Id: I1e18426806b0a6e1cb2ef1bbf5c003e5a8a8e1c2
Former-commit-id: 13fbcbd0a2cb70228a47d63839640c7612caaa2a
2015-03-04 14:07:01 -05:00
Ana Rivera
8cd3ed15bb
Merge branch 'omaha_15.1.1' into field_15.1.1
...
Change-Id: I46ed5379753021871381803e9e84e1c6a37ded10
Former-commit-id: a35b2c8cbd4e07bf92fbc32d8548f9fa0c0a9dd5
2015-03-04 18:30:37 +00:00
Nate Jensen
55baf5c2f1
Omaha #3978 fix http ebxml thrift service
...
Change-Id: I50e57fcafd472cbfd72fc911e863e118a62ab5ba
Former-commit-id: 6fca25e457989f4757999cfcce40ff9a3b1fc393
2015-03-03 17:20:25 -06:00
David Gillingham
07805e808c
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
9648dbc550
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
bd9b97063e
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
f00b3d3156
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
5a9b7e3367
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
8bfe8fb65f
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
Ana Rivera
8670f04ae9
Merge "VLab Issue #6615 - DR_17086 Derived TDWR products do not have green time; fixes #6615 " into field_15.1.1
...
Former-commit-id: 76e7f1dc1382745bf014041e29856b05198d8d65
2015-03-03 18:53:03 +00:00
Ana Rivera
8d97d5e70e
Merge "VLab Issue #6616 - DR_17099 Can not display TLAS elev 0.8 product; fixes #6616 " into field_15.1.1
...
Former-commit-id: 04730c9cede339cba78bfb71b81b1a57d7c35d8a
2015-03-03 17:14:27 +00:00
Ana Rivera
53befbb3ce
Merge "VLab Issue #6612 - DR_14627 TDWR radar menu extra 0.0; fixes #6612 " into field_15.1.1
...
Former-commit-id: fd139aaa9f0bb377dfd6bbc89a6d97cbd62f7a43
2015-03-03 17:13:42 +00:00
