Nate Jensen
96153d789c
Merge "Omaha #3226 encryption support for total lightning" into omaha_14.4.1
...
Former-commit-id: 5dae4676209b73096d46
2014-06-10 12:00:58 -05:00
Brian.Dyke
ef5c74dece
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
...
Former-commit-id: 8874d41872c1b3f9d180
2014-06-10 12:52:59 -04:00
Brian Clements
ae54caa806
Omaha #3226 encryption support for total lightning
...
Change-Id: I87af2d986830681d258c065304e3ebfb2d2af8db
Former-commit-id: d4c55244a193efa905a3
2014-06-10 08:46:41 -05:00
Nate Jensen
771acd01b1
Omaha #3266 remove redbook menu util's use of dataURIs
...
Change-Id: I2181c18e1b934538e463679bc5bdcb4bb7e411a3
Former-commit-id: 5267f93292c401bb5992
2014-06-09 16:25:49 -05:00
Steve Harris
6e09bce335
Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
...
Former-commit-id: bd98f04cde14370245fd
2014-06-09 15:20:03 -05:00
Nate Jensen
9666b22375
Omaha #3211 fix data delivery modes
...
Change-Id: I06fede8fd63e0a71f5532e8124bf919faf62612e
Former-commit-id: 08c5c75035cd7e1a4665
2014-06-09 14:34:18 -05:00
Ben Steffensmeier
314ae86d14
Omaha #3187 Add acars DAF factory.
...
Former-commit-id: 5348dfaa9f3774156385
2014-06-09 13:18:21 -05:00
Nate Jensen
cc68bc763f
Merge "Omaha #2061 Allow acars to return data through point data requests." into omaha_14.4.1
...
Former-commit-id: 156e195bd39737e931d3
2014-06-09 09:41:45 -05:00
Nate Jensen
a8022b8363
Merge "Omaha #3226 added total lightning decoder" into omaha_14.4.1
...
Former-commit-id: 19bef8d080c8b6324240
2014-06-09 09:38:50 -05:00
Ben Steffensmeier
f0be972b0a
Omaha #3243 Update AWIPS2 references to remove deprecated lambert conformal creation.
...
Former-commit-id: 08c5348b8469fb937150
2014-06-06 15:17:19 -05:00
Ben Steffensmeier
f0f1c0287f
Omaha #2061 Allow acars to return data through point data requests.
...
Former-commit-id: 4ea7f35d7a7a66ea3e67
2014-06-06 15:14:53 -05:00
Brian Clements
2e445986e2
Omaha #3226 added total lightning decoder
...
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning
Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3
Former-commit-id: f39896b2d1c278000764
2014-06-06 14:39:57 -05:00
Xuezhi.Wei
81ec03e291
ASM #579 - shef-ingest.xml updates for performance tracking
...
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: 33b235a0a4bdbeec662c
2014-06-06 17:40:09 +00:00
Nate Jensen
5e9faea6e7
Merge "Omaha #3232 Radar code improvements." into omaha_14.4.1
...
Former-commit-id: 920e53628b3b324093ae
2014-06-05 17:38:32 -05:00
Sean Webb
e0f9eabb45
Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
...
Former-commit-id: cb43d21243016648ffaf
2014-06-05 15:03:11 -05:00
Ben Steffensmeier
3eb6b79c56
Omaha #3232 Radar code improvements.
...
Former-commit-id: 26325b57be8587b9b43b
2014-06-05 14:53:25 -05:00
Fay.Liang
fa2cdbfac1
ASM #611 fix to MHS issues in DR_17297
...
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7
Former-commit-id: c5e6daa943d1aa160aa7
2014-06-05 15:49:27 -04:00
Stephen Gilbert
11cf39ce44
VLab Issue #3648 - Corrected NCEP additions for ESTOFS model
...
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b
Former-commit-id: d49482965eb7d93ed06d
2014-06-05 12:06:35 -04:00
Mike Duff
28a42f3f10
Issue #3222 - Fix for SHEF posting times
...
Former-commit-id: f5f101d4168a5acd085d
2014-06-05 09:35:07 -05:00
Ron Anderson
bc7e037504
Omaha #3130 Fix thread safety issue in NetCDFFile.
...
Change-Id: I99999c827507a565e1980fe2b686cef4d848fe7d
Former-commit-id: 68a0c4224247bdee2a58
2014-06-04 16:31:32 -05:00
Ron Anderson
6cc9f69555
Omaha #3071 Fix one more possible NPE
...
Change-Id: I23c3f47d354a2a5ee4576a6040e2012b3b39dfe6
Former-commit-id: fde392dcd1d772e2b49b
2014-06-04 16:26:25 -05:00
Greg Armendariz
59f25a8790
Omaha #3227 - Add memory check to capture script
...
Change-Id: Icce56d22be3c785ccfe41903b01eabdbe49c5475
Former-commit-id: fc887885475b1f81551c
2014-06-04 10:00:59 -05:00
Brian.Dyke
feb26ee9b7
Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 3919c9ec2f61b206be0b
2014-06-04 07:46:16 -04:00
Brian.Dyke
896aeeb2dd
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 329393d1722fb1e52728
2014-06-04 07:41:40 -04:00
Brian.Dyke
2db2536d02
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 696bf39f266437ee2322
2014-06-04 07:41:28 -04:00
Kenneth Sperow
a59743ebe0
Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8
Former-commit-id: f2a738cc25c302ef8967
2014-06-03 20:55:29 -07:00
brian.dyke
789482b0e3
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: b3d95ca18d79f866fb17
2014-06-03 16:14:16 -04:00
Ron Anderson
78b8fe9f92
Omaha #3071 Fix error in IFPGridDatabase found in code review
...
Change-Id: I7bdab6085d49f0ed3667cc4d27dc58aae24d0bcf
Former-commit-id: 03b44f91d0cf44e1835a
2014-06-03 14:15:51 -05:00
Nate Jensen
abb63ad32d
Merge "Omaha #3226 moved ost lightning code to new plugin" into omaha_14.4.1
...
Former-commit-id: 364e6ea94ac3b8358eb6
2014-06-03 08:09:16 -05:00
Ron Anderson
bd50ae9854
Omaha #3052 Improved TopoQuery error handling to throw exceptions with useful error messages.
...
Change-Id: Ic181682611801ea244b986e8a2ce1400c4dc15d1
Former-commit-id: 304364e3563f169399b8
2014-06-02 17:14:18 -05:00
Brian Clements
0f029c3015
Omaha #3226 moved ost lightning code to new plugin
...
fixed NPE when missing encryption config
Change-Id: I8ef6004f44b686918220e7729a499e456787a834
Former-commit-id: 6b09d9b3c5664d9282c3
2014-06-02 15:33:41 -05:00
Nate Jensen
21468f0f2d
Merge "Omaha #3211 fix edex startup issues" into omaha_14.4.1
...
Former-commit-id: 9269a938ceff799b8044
2014-06-02 14:43:34 -05:00
cmadmin
05dac7601b
Merge "Omaha #3132 Fix ohd merge issues." into omaha_14.4.1
...
Former-commit-id: 75ee567f85e5ffd0f40c
2014-06-02 13:59:15 -05:00
Ron Anderson
8ef6180ac2
Omaha #3132 Fix ohd merge issues.
...
Change-Id: I9cd7f10b55d4e599152827e4f5a793be11ce37fc
Former-commit-id: c294a06b720c569e6249
2014-06-02 13:40:26 -05:00
Ron Anderson
0d44ffc6dc
Merge "Omaha #3071 Fix several errors identified by the log tool" into omaha_14.4.1
...
Former-commit-id: d301a71c9af5a89ce811
2014-06-02 13:37:41 -05:00
Nate Jensen
6e85b66b1b
Omaha #3211 fix edex startup issues
...
Change-Id: I634ec432e7136e191706d4b8b7063d845dd9fb7c
Former-commit-id: cf5a1d16c9f973ce1bbe
2014-06-02 12:39:34 -05:00
Steve Harris
ff567e9e38
Omaha #3132 - ohd merge core files should go in ufcore
...
Former-commit-id: 97523137b969d0ad089e
2014-06-02 12:11:00 -05:00
Ron Anderson
8daa3bac9c
Omaha #3071 Fix several errors identified by the log tool
...
Change-Id: I98aa1101fa796bd4ad93d2b8556248bbd13219e4
Former-commit-id: ca0946b5f89ebbc261b1
2014-06-02 12:08:35 -05:00
Steve Harris
647cd97e29
Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
edexOsgi/build.edex/edex/common.properties
edexOsgi/build.edex/esb/conf/modes.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so
Former-commit-id: 455eb8b39d7fec0d039c
2014-06-02 11:21:46 -05:00
Steve Harris
4e26e224fd
Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1
...
Former-commit-id: 3bde6b3e4165a3390a6a
2014-06-02 07:31:14 -05:00
Brian.Dyke
de2df4cb6f
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: c6244e1950b8ba378862
2014-06-02 07:01:37 -04:00
Brian.Dyke
a0a879be7d
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: 3f1e12effca8737e18f0
2014-05-30 10:46:25 -04:00
brian.dyke
2c2bb61e95
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 03cc2fbbfb95c5dc49c1
2014-05-30 10:09:00 -04:00
brian.dyke
2f53c2e385
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: ee7c67f7b07dde6e1d04
2014-05-30 10:07:12 -04:00
Matthew Howard
099185c960
Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
...
Former-commit-id: 8375a2af3e781d0331ab
2014-05-29 15:54:37 -05:00
Shawn.Hooper
08ad9a66cc
ASM #209 - Fix Svcbu cleanup script
...
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: 5cf0579d20fe567b2a5b
2014-05-29 16:56:46 -04:00
Richard Peter
3beef299b1
Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
...
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289
Former-commit-id: e2288769d3558699a370
2014-05-29 15:50:59 -05:00
Nate Jensen
e4029da3dc
Omaha #3211 changes to support improved authentication/authorization
...
Change-Id: If793dcbe3bed741f1b75ce338b152eb69d845172
Former-commit-id: 1e362625e54fdb6df9a1
2014-05-29 15:28:53 -05:00
Richard Peter
82bf2b9e94
Merge "Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository" into omaha_14.4.1
...
Former-commit-id: 1c04a15ec79cd8710876
2014-05-29 14:13:54 -05:00
Nate Jensen
a709601e2f
Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1
...
Former-commit-id: c43a2bf2175cfbcb7e98
2014-05-29 13:51:09 -05:00
