Nate Jensen
|
fbad2f72d5
|
Merge "Omaha #3163 Fix collaboration string differencing" into omaha_14.4.1
Former-commit-id: 4535b6ce392515daa465f395fb002b9c4116c111
|
2014-06-03 16:17:34 -05:00 |
|
Ron Anderson
|
cf44e1835a
|
Omaha #3071 Fix error in IFPGridDatabase found in code review
Change-Id: I7bdab6085d49f0ed3667cc4d27dc58aae24d0bcf
Former-commit-id: 97dd32f3ee5393e419ca7794eb2f564a4941494e
|
2014-06-03 14:15:51 -05:00 |
|
Ben Steffensmeier
|
ca2210b3e7
|
Omaha #3163 Fix collaboration string differencing
Former-commit-id: e6f30c822de26bafae339a8871c4ba98100e6d1a
|
2014-06-03 13:51:46 -05:00 |
|
Nate Jensen
|
c3b8358eb6
|
Merge "Omaha #3226 moved ost lightning code to new plugin" into omaha_14.4.1
Former-commit-id: 87eef5bc338290f252879801b86e6df64b7c6f1c
|
2014-06-03 08:09:16 -05:00 |
|
Ron Anderson
|
3f169399b8
|
Omaha #3052 Improved TopoQuery error handling to throw exceptions with useful error messages.
Change-Id: Ic181682611801ea244b986e8a2ce1400c4dc15d1
Former-commit-id: 0d42d4fdc56122c3df912c93e5e09b0ab28c1b37
|
2014-06-02 17:14:18 -05:00 |
|
Brian Clements
|
664d9282c3
|
Omaha #3226 moved ost lightning code to new plugin
fixed NPE when missing encryption config
Change-Id: I8ef6004f44b686918220e7729a499e456787a834
Former-commit-id: 5421b666fc52e849e4ad5b39e2328a5c90a42408
|
2014-06-02 15:33:41 -05:00 |
|
Nate Jensen
|
ff799b8044
|
Merge "Omaha #3211 fix edex startup issues" into omaha_14.4.1
Former-commit-id: 367289573446fcb10678af38ce36ab8797889a6d
|
2014-06-02 14:43:34 -05:00 |
|
Steve Harris
|
08b88a11ab
|
Merge branch 'omaha_14.3.1' (14.3.1-9) into omaha_14.4.1
Former-commit-id: 7ab6907a20cb77106a26e528abcc83c961a2ed84
|
2014-06-02 14:34:53 -05:00 |
|
Steve Harris
|
b3b768ee87
|
Merge branch 'master_14.3.1' (14.3.1-9) into omaha_14.3.1
Former-commit-id: 4618c3ab6ae346649438d497712e4a8ab2ae91bd
|
2014-06-02 14:29:39 -05:00 |
|
Steve Harris
|
4c41c736b1
|
Issue #2754 - added .project file to ohd/com.raytheon.uf.edex.ohd.feature/
Former-commit-id: dd6245e5abd2973fd47e0cc5ca1b79470122181c
|
2014-06-02 14:04:01 -05:00 |
|
cmadmin
|
e5ffd0f40c
|
Merge "Omaha #3132 Fix ohd merge issues." into omaha_14.4.1
Former-commit-id: b57f019ff57da1193823bcba75698077f7c7e6b4
|
2014-06-02 13:59:15 -05:00 |
|
Ron Anderson
|
0c569e6249
|
Omaha #3132 Fix ohd merge issues.
Change-Id: I9cd7f10b55d4e599152827e4f5a793be11ce37fc
Former-commit-id: 5b3b83fe73b905c1d3e3743baf632e1364475eaf
|
2014-06-02 13:40:26 -05:00 |
|
Ron Anderson
|
f5a89ce811
|
Merge "Omaha #3071 Fix several errors identified by the log tool" into omaha_14.4.1
Former-commit-id: 8c710088b9d9539c240de61b7d58963d3b83326e
|
2014-06-02 13:37:41 -05:00 |
|
Nate Jensen
|
d94a040f29
|
Merge "Omaha #2918 Synchronize mosaic dataTimes." into omaha_14.4.1
Former-commit-id: 4abb30354ef4f6c6520ee993a66371656db0db9f
|
2014-06-02 12:44:17 -05:00 |
|
Nate Jensen
|
f973ce1bbe
|
Omaha #3211 fix edex startup issues
Change-Id: I634ec432e7136e191706d4b8b7063d845dd9fb7c
Former-commit-id: dd5cabbc335662e0583b76a5bef6bfdf28569735
|
2014-06-02 12:39:34 -05:00 |
|
Steve Harris
|
69d0ad089e
|
Omaha #3132 - ohd merge core files should go in ufcore
Former-commit-id: 6e27d0eb0461e3c3d64b04f8179f946d973251f1
|
2014-06-02 12:11:00 -05:00 |
|
Ron Anderson
|
9ebbc261b1
|
Omaha #3071 Fix several errors identified by the log tool
Change-Id: I98aa1101fa796bd4ad93d2b8556248bbd13219e4
Former-commit-id: ca6a36be221da70cd766c6e844e2852bd67f69c3
|
2014-06-02 12:08:35 -05:00 |
|
Steve Harris
|
7fec0d039c
|
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: 45250149681f057cf168f4d3cb27276279f62c05
|
2014-06-02 11:21:46 -05:00 |
|
Ben Steffensmeier
|
8a117864d8
|
Omaha #2918 Synchronize mosaic dataTimes.
Former-commit-id: c4d8ed9d0d7eb4c17d8a0922302a3fc50a0ae383
|
2014-06-02 10:41:45 -05:00 |
|
Steve Harris
|
65a3390a6a
|
Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1
Former-commit-id: ee696cb24c8d72f0562126a131824e958b88f090
|
2014-06-02 07:31:14 -05:00 |
|
Brian.Dyke
|
b8ba378862
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: dec7b6fa091cab098b89a51551fa46b9f28b959b
|
2014-06-02 07:01:37 -04:00 |
|
Ron Anderson
|
1108744b40
|
Omaha #2841 Fix errors when formatters fail to queue due to pending limit.
Change-Id: Icf70e25369a23b7b554718cf235feda02e615f0d
Former-commit-id: b15cb1632b58c415399ccc8dee6cf2c13140355f
|
2014-05-30 10:47:28 -05:00 |
|
Brian.Dyke
|
a8737e18f0
|
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: 9d7a819489480e119b65cb5643520818adeb1ebf
|
2014-05-30 10:46:25 -04:00 |
|
Ron Anderson
|
8309a5656a
|
Merge "Omaha #2841 Separate queuing of text formatters and product scripts." into omaha_14.4.1
Former-commit-id: e13f80b81df762d6658cce9ad534dc499791ba46
|
2014-05-29 18:50:52 -05:00 |
|
Ron Anderson
|
a9f3b486f3
|
Omaha #2841 Separate queuing of text formatters and product scripts.
Change-Id: I4bfab25d4563914e7390b59d1717e8c82b016eb8
Former-commit-id: 216be7d4dd6da9aefbdd6c55e9fd09f1a60bc53a
|
2014-05-29 16:55:02 -05:00 |
|
Richard Peter
|
558699a370
|
Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289
Former-commit-id: b48d9bd6affc340ef4791c99cbc95f122c4a69f8
|
2014-05-29 15:50:59 -05:00 |
|
Nate Jensen
|
4fdb6df9a1
|
Omaha #3211 changes to support improved authentication/authorization
Change-Id: If793dcbe3bed741f1b75ce338b152eb69d845172
Former-commit-id: c4eeb1730778f7f18aa4d74587ebcddb3932c6e6
|
2014-05-29 15:28:53 -05:00 |
|
Richard Peter
|
9cd8710876
|
Merge "Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository" into omaha_14.4.1
Former-commit-id: df4e87624ad0bc6db759677435e7c276f500d3da
|
2014-05-29 14:13:54 -05:00 |
|
Richard Peter
|
fca34641a0
|
Merge "Omaha #3210 - moving foss from cots/ into AWIPS2_foss repository" into omaha_14.4.1
Former-commit-id: 933f04911ad40e66f49da96c872306f4e89a2eca
|
2014-05-29 14:01:22 -05:00 |
|
Nate Jensen
|
5cfbcb7e98
|
Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1
Former-commit-id: 5f72fc0a65a1b3b64298a2aacaa18ab84c8df93e
|
2014-05-29 13:51:09 -05:00 |
|
Steve Harris
|
79d5592fdf
|
Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository
Change-Id: Ib313d71006c3d23a76c1589fded47102fea80b9a
Former-commit-id: c944b3b98f68b8f65b853fb244002e3382dc38a2
|
2014-05-29 13:42:09 -05:00 |
|
Roger Ferrel
|
44a23b4500
|
Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085
Former-commit-id: 1249deb91b6463044a59ca564e26f82612f52d40
|
2014-05-29 12:33:15 -05:00 |
|
Steve Harris
|
24de47720f
|
Omaha #3210 - moving foss from cots/ into AWIPS2_foss repository
Former-commit-id: 762b2ad4da3ab2944b0df17ce655bcc60d02bdc3
|
2014-05-29 12:00:50 -05:00 |
|
Brian Clements
|
fb71fae2d1
|
Omaha #3179 moved ebxml ecludes from datadelivery to registry modes
Change-Id: Id95a5b7ca307a52a2ae271becfc73c4fccef12de
Former-commit-id: f3baedf6187a70e9c98d73b6819fa46e9c00c702
|
2014-05-29 11:58:10 -05:00 |
|
Brian Clements
|
a1da843e2a
|
Omaha #3179 added modes directory to custom targets
Change-Id: I43587e7d33cddd8dcd4b8056c90cc88bd78df1fe
Former-commit-id: 3d324c5b62a1f960099a5515cbd7c588ce7c5d7f
|
2014-05-29 09:08:53 -05:00 |
|
Brian Clements
|
5d0eaf02ab
|
Omaha #2536 merge autobldsrv into text plugins
Change-Id: I4a149b9f16dcc868274bca7e2f4de3d4dad78e52
Former-commit-id: 5ae9b617dfeb4ff809916706ac1e849f762bd5a2
|
2014-05-29 08:19:47 -05:00 |
|
Ben Steffensmeier
|
c7c6c1b7ec
|
Omaha #2990 Fix radar mesocyclone regex.
Former-commit-id: 8e03f08f2d01f8b47101c09f950a0830cf8f0bb6
|
2014-05-28 16:40:35 -05:00 |
|
Nate Jensen
|
942aa72b01
|
Merge "Omaha #3179 split modes.xml into plugin modes files" into omaha_14.4.1
Former-commit-id: eec07fb20d6566b1e1d361ef971e50e5a019fcbf
|
2014-05-28 13:42:07 -05:00 |
|
Brian Clements
|
5e39a68498
|
Omaha #3179 split modes.xml into plugin modes files
Change-Id: I31e59b28fca166aff0cbd9ca13bf81aa67d6b46a
Former-commit-id: e626f47c9bb8900af2f4734513b2c94b83f082c8
|
2014-05-28 13:32:18 -05:00 |
|
Nate Jensen
|
3e174fe39c
|
Merge "Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager." into omaha_14.4.1
Former-commit-id: db3ff4b3bf81cbea49169369be01ce5c919157fd
|
2014-05-28 12:43:12 -05:00 |
|
Brian Clements
|
c227a54da0
|
Omaha #3152 modified rcm build to deploy logback instead of log4j
Change-Id: I829bea003053d5f2b0cf17234fc26a8ff35334ac
Former-commit-id: d9c3f3845e51f5892c80ec6e4b8ed6efc2769d0e
|
2014-05-28 12:17:39 -05:00 |
|
Ron Anderson
|
da0a173698
|
Merge "Omaha #3110 Permanent fix for mutable database creation." into omaha_14.4.1
Former-commit-id: 3869a36a6cad1674e8ec493d03937c21ddde7f21
|
2014-05-28 11:59:51 -05:00 |
|
Richard Peter
|
daaaed85d5
|
Merge "Omaha #3137 - Add checks to prevent NullPointerException." into omaha_14.4.1
Former-commit-id: 93ab5e949da1f654ea15a2044b587125f3243ebc
|
2014-05-28 11:07:41 -05:00 |
|
Nate Jensen
|
905fa8f283
|
Merge "Omaha #3133 Removed dead hydro code and related dependencies" into omaha_14.4.1
Former-commit-id: 55cf25f0671f17e667f7c785f3580a93267f8790
|
2014-05-28 10:28:49 -05:00 |
|
Ron Anderson
|
4633de4ea3
|
Omaha #3110 Permanent fix for mutable database creation.
Former-commit-id: a0001c9ed3d414237069f43a29dd907111c16832
|
2014-05-28 10:09:12 -05:00 |
|
Roger Ferrel
|
3331d58e1c
|
Omaha #3137 - Add checks to prevent NullPointerException.
Former-commit-id: 42dcb85d536485f3ae244e69a315e88169d04c97
|
2014-05-28 09:54:37 -05:00 |
|
Steve Harris
|
63020bd766
|
Omaha #3132 - new TPCSurgeProb files should have gone to core in the merge
Former-commit-id: 80da354c8bacab21dc0675f280989c2d8e15acd4
|
2014-05-28 09:32:43 -05:00 |
|
Steve Harris
|
be80bd01f3
|
Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java
Former-commit-id: 802843fa475654ffab03545a4970f4e5857590cd
|
2014-05-28 09:01:00 -05:00 |
|
Steve Harris
|
2c49d14c12
|
Merge branch 'master_14.3.1' (14.3.1-7) into omaha_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
Former-commit-id: 70398b6d6c43e8931d4d88660af2ba7a8b2668e2
|
2014-05-28 07:41:42 -05:00 |
|
Nate Jensen
|
514c9d3a0c
|
Omaha #3133 Removed dead hydro code and related dependencies
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a
Former-commit-id: 13d3dc45edab66106e9aa5a1149ca05e94d144c3
|
2014-05-27 18:23:38 -05:00 |
|