Commit graph

8090 commits

Author SHA1 Message Date
David Lovely
cdd4141d18 Omaha #3799 Upgraded QPID to version 0.32
Former-commit-id: bede2a938cdc5b97d288a79b41ef5123a8cb75bd
2015-03-25 21:43:58 -05:00
Nate Jensen
d0a93c7e53 Merge "Omaha #3977 Add ability to import DamagePath from DistanceSpeed" into omaha_16.1.1
Former-commit-id: cef5e18c2fe7b7a565ce6108f1603d0fb88390a2
2015-03-25 15:33:29 -05:00
Nate Jensen
b92a5d8871 Merge "Omaha #4316 Collaboration chats need to show dates" into omaha_16.1.1
Former-commit-id: 4029aabfef76c5d6113a4bcbbb730f871510cdf4
2015-03-25 14:59:00 -05:00
Nathan Bowler
a3d925b745 Omaha #3977 Add ability to import DamagePath from DistanceSpeed
Change-Id: Ibdede2ec4d973251b5755eabdb65bb5d926dfa27

Former-commit-id: e6bfe389158dbc6a0739e60c08c8175a2e53b084
2015-03-25 15:54:47 -04:00
Mark Peters
2ba50e9fa4 Omaha #4316 Collaboration chats need to show dates
Change-Id: I9eff75484acc4d5ed9c7f23714e0412070a99144

Former-commit-id: 32a5f5f314a97c834df8fb487d88ffc7013a3413
2015-03-25 14:17:15 -05:00
David Lovely
d87f7c6215 Omaha #4178 Java 1.7u76 Upgrade
Former-commit-id: 50c46ce076713a18076b45110e373fba6d39b841
2015-03-25 10:46:34 -05:00
Mark Peters
7efcfcd429 Omaha #4265 Collaboration alert words should be able to load from different localization levels
Change-Id: Ia11db64b7e5a0ac246355b9bfbe6207484ef7bc1

Former-commit-id: 203ada0e884d0c7ade4642ffbc227faeac393254
2015-03-24 15:59:36 -05:00
Nate Jensen
24d7b86a74 Merge "Omaha #4227 Add support for retrieving warnings data through Data Access Framework" into omaha_16.1.1
Former-commit-id: 045ddab9dd8c143e14deb7ccbcb54160fe3d3e66
2015-03-24 12:53:48 -05:00
Mark Peters
138fa3b0e8 Omaha #4227 Add support for retrieving warnings data through Data Access Framework
Change-Id: Ie0a68b2c714a903d14ecf25a4827f6bba0962478

Former-commit-id: fc570a7a2eadf0c07bf6a485ec215b64c10b16a9
2015-03-24 12:40:24 -05:00
Nate Jensen
64a82afdc9 Merge "Omaha #4259 clean up pyjclass optimization for inclusion in jep" into omaha_16.1.1
Former-commit-id: 5d1b229924399e16617347162e97e3210608a8f8
2015-03-23 17:28:11 -05:00
Nate Jensen
1d87ce6e8b Omaha #4259 clean up pyjclass optimization for inclusion in jep
Change-Id: I2f887276fcdaeb57b8c0193bcc92397328400954

Former-commit-id: aac3401e112bf8f7d85dc3a08788fc6a30afc91a
2015-03-23 15:12:01 -05:00
Nate Jensen
7c9754df2d Omaha #4259 remove mistakes from 2009
Change-Id: I5d52789d72f0ed0a6fb46c9d1012615f34d39963

Former-commit-id: 55d47895ae2bb64601178b1aceabdbf2a655fb94
2015-03-23 15:10:08 -05:00
Nathan Bowler
52015cb11f Omaha #4292 Add contour range using A1 configuration rules.
Change-Id: Icbf7a5cf37bace18cc29e151ffe302e90373b2f4

Former-commit-id: 2dc23f20d012772a575f08b57c67602ea3991a9a
2015-03-19 15:53:42 -04:00
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