Steve Harris
c585001981
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: 3e863af798cf64ae9bbde71649339aa99698e33b
2015-03-18 16:05:13 -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
Lee Venable
453426809f
Merge "Omaha #4234 remove code that doesn't work anyway" into omaha_15.1.1
...
Former-commit-id: b9e6d3d5d5eeb43136709f59a1e980919fa4b73f
2015-03-18 13:16:41 -05:00
Nate Jensen
f5e4751703
Omaha #4234 remove code that doesn't work anyway
...
Change-Id: I6747dcc1ccb3f7c3b424b996d63417f4a86a171b
Former-commit-id: 26b21f4db52aa6dd802a5de460b98e1758bc6872
2015-03-18 11:50:10 -05: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
Steve Harris
169b925507
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: 04fa26ff310af7fd9574eeae98900d83e18ba276
2015-03-18 08:50:05 -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
Nathan Bowler
ea3e5df0b8
Omaha #4261 Move performance logging to the performance log
...
Change-Id: If31b5f4262eb1205ea44e1ee3c3553bfc2e7c085
Former-commit-id: 86b1973a5f3a638e3ab90a804985ffedcddbadcb
2015-03-17 14:32:24 -04:00
Nate Jensen
ffd2ca584e
Omaha #4259 improve jep exception handling to properly include CausedBys
...
when jep encounters java exceptions and include python stack as part of
the stacktrace so only the exception message is shown to users
Change-Id: Ic62c2c2a8f4b54a95cbac526f118e5b43702db70
Former-commit-id: 9c72a28d06a8d2d6bd052e0858568b65ed1cb14a
2015-03-16 20:25:23 -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
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
9353ac363a
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: ce42fe1d1c2ef5f664a522ec30fa91661b4aab3b
2015-03-13 15:59: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
Nate Jensen
d4763501ce
Merge "Omaha #4204 ensure renamed bundle loads to tab name on next load" into omaha_15.1.1
...
Former-commit-id: 017e83b7f5c36b0c672b80854049f17bff023b91
2015-03-13 09:44:50 -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
Nate Jensen
2642cec7ab
Omaha #4204 ensure renamed bundle loads to tab name on next load
...
Change-Id: Ie6e6ef3e40407b8baa0c733da89d738ed27b329b
Former-commit-id: 5bc22166c63aea3b35f18aa0a5a82f6f26021ac2
2015-03-12 17:51:53 -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
Ron Anderson
370d0a0f70
Omaha #3955 Fix regression that brok ViewWCL
...
Change-Id: Ib1ff4137004cff22ef94e8029bbc62875992252e
Former-commit-id: 6af18dc2a364507481a119661f940aa420e379a9
2015-03-12 12:58:00 -05:00
Fay.Liang
70714494f9
Merge tag 'OB_14.3.2-21m' into master_14.4.1
...
14.3.2-21m
Former-commit-id: f08ea9cd7acadd1f8f1bb2eedf7ce39894c3f39e
2015-03-11 14:32:22 -04: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
Fay.Liang
d06537cf12
Merge branch 'master_14.3.1.1' into master_14.3.2
...
Former-commit-id: 450fdfceca0e7f3745a8dcbffe3d7740ff1aee64
2015-03-10 14:52:49 -04:00
Fay.Liang
03a84c325e
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: 93ab4740381b75ba8bf713117a417febdacb6b33
2015-03-10 13:53:51 -04: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
Sean.Webb
4ef6100cf8
ASM #17227 - Fixed total lightning pattern
...
Change-Id: I889a405685e1b51cb115d40ada425f80947920d2
Former-commit-id: 4349757b615d3963d3201c1045fa7599c09acdf8
2015-03-10 12:43:15 -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
Lee Venable
f0b3a411c9
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: 2761ef3683f42ce3d6aa81915dea81c453f3aa44
2015-03-10 09:05:23 -05:00
Steve Harris
fdac40e9b1
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: 28ce8ff8e28e73375a942d0d15700f1cbb06ec24
2015-03-09 21:41:36 -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
Lee Venable
23a1acd019
Omaha #3856 - check if the timer is running when setting the icon in the timer action method.
...
Former-commit-id: ad840e023f40fe7d35bfeb21f1116d43bc06e472
2015-03-09 16:52:59 -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
David Friedman
3c45c2d158
ASM #17190 - Counties being listed twice in Zone based products with extra county entries in shapefile
...
Change-Id: Ie3cb35803e7ef08a4147d85c9a7f28b0476ce5a2
Former-commit-id: 6d8bd3315f48d188507a76092a950511a75c142c
2015-03-09 14:23:35 +00:00
Evan Polster
6b7bec9ce8
VLab Issue #6773 ; Fixed problem where LAPS config file wasn't being persisted to the server; fixes #6773
...
Change-Id: I133973de6a129709a151313f090066b09bc4222e
Former-commit-id: 948baed3df402f659cf9b80fd10a3bc3d9788036
2015-03-06 23:07:47 +00:00
Steve Harris
20325c7695
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: 093edfb1764b6a07b6cf361ece129740c4d85c89
2015-03-06 10:49:58 -06: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
Nate Jensen
a2ca1fa0f8
Merge "Omaha #4217 DataAccessLayer should sort available times" into omaha_16.1.1
...
Former-commit-id: 800edc087409a8ea1d9beb18dbe68ccc28c21e72
2015-03-05 12:41:37 -06:00
Shawn.Hooper
54d5553a93
ASM #17178 - Update TCMWindTool to remove option for background Wind field
...
Change-Id: Ia299900784b9fe05a68ca25a74528abdc68a3f1f
Former-commit-id: bc4ec070e81298f7ed7312692a7f43cbd2d854ec
2015-03-05 12:58:44 -05: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
Mark Peters
8d226dc44e
Omaha #4217 DataAccessLayer should sort available times
...
Change-Id: Ie78d637e2ea382de86e1e012a14affa66bf4fa6d
Former-commit-id: 2d70c8d16cac23710ad6d03d96c4c393ed84b3fa
2015-03-05 10:55:49 -06:00
Lee Venable
e3a4548d52
Omaha #4183 - Fix exception handling in openWindows()
...
Former-commit-id: 11f7fbccade83be4c9e985bbf9a26a241fed8fe0
2015-03-05 10:03:37 -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
Fay.Liang
c5257a52c6
Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 1dc1cede71ab27d3339f396369827a6a89a8ad80
2015-03-05 10:33:36 -05:00
Steve Harris
23c995a81a
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: 9536839a504e418349cd796e3da32c13e71abcf8
2015-03-04 21:10:17 -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
Nate Jensen
4147e78ef4
Omaha #4194 fix damage path issues
...
Change-Id: I0a8d08518590daa6e0f1c6c47437616cdeaddf17
Former-commit-id: c2cf4add2f32c87ab26246c7a68420fa6df7b5a0
2015-03-04 13:39:53 -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
Nathan Bowler
2c1573ee37
Omaha #4189 Handle exceptions with var height graphs.
...
Change-Id: I1cef09db5fab7549826ee2cca1c8dc197d46751f
Former-commit-id: 3deb18d135520687261ce7606725901146742f46
2015-03-04 10:27:45 -05:00
