Nate Jensen
|
4299caf439
|
Merge "Omaha #3226 added total lightning decoder" into omaha_14.4.1
Former-commit-id: a8022b8363 [formerly c8b6324240] [formerly a8022b8363 [formerly c8b6324240] [formerly 19bef8d080 [formerly ffa3e069c0beb5678ecb863b2950556d8c289ae1]]]
Former-commit-id: 19bef8d080
Former-commit-id: 87abeb25b9 [formerly 1d619bcf95]
Former-commit-id: 17e3c5f898
|
2014-06-09 09:38:50 -05:00 |
|
Brian Clements
|
8046cbc417
|
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: 2e445986e2 [formerly c278000764] [formerly 2e445986e2 [formerly c278000764] [formerly f39896b2d1 [formerly e2583481a77d08249030838ebd52eed6e54b2986]]]
Former-commit-id: f39896b2d1
Former-commit-id: 77b1f85fe1 [formerly b98a3494fe]
Former-commit-id: ca1b869647
|
2014-06-06 14:39:57 -05:00 |
|
Nate Jensen
|
10350a1337
|
Merge "Omaha #3232 Radar code improvements." into omaha_14.4.1
Former-commit-id: 5e9faea6e7 [formerly 3b324093ae] [formerly 5e9faea6e7 [formerly 3b324093ae] [formerly 920e53628b [formerly 22a5da1feff7e30ea0408f089305d95657befad2]]]
Former-commit-id: 920e53628b
Former-commit-id: f2d753fa64 [formerly c0f047b24f]
Former-commit-id: 24f7247805
|
2014-06-05 17:38:32 -05:00 |
|
Ben Steffensmeier
|
dc5a927bb8
|
Omaha #3232 Radar code improvements.
Former-commit-id: 3eb6b79c56 [formerly 8587b9b43b] [formerly 3eb6b79c56 [formerly 8587b9b43b] [formerly 26325b57be [formerly 696f45d67c5e5b02183f97cfcc139db017f01848]]]
Former-commit-id: 26325b57be
Former-commit-id: 4f83edfa72 [formerly b8fe181c9a]
Former-commit-id: 9e97750df2
|
2014-06-05 14:53:25 -05:00 |
|
Ron Anderson
|
bffcf0662f
|
Omaha #3130 Fix thread safety issue in NetCDFFile.
Change-Id: I99999c827507a565e1980fe2b686cef4d848fe7d
Former-commit-id: bc7e037504 [formerly 47bdee2a58] [formerly bc7e037504 [formerly 47bdee2a58] [formerly 68a0c42242 [formerly 36f4c0f9b339dc91577cb231e2804d83f4f52706]]]
Former-commit-id: 68a0c42242
Former-commit-id: ded2e7d348 [formerly 3f4bdb7377]
Former-commit-id: fe1a2a8ebc
|
2014-06-04 16:31:32 -05:00 |
|
Ron Anderson
|
5eef76f45a
|
Omaha #3071 Fix one more possible NPE
Change-Id: I23c3f47d354a2a5ee4576a6040e2012b3b39dfe6
Former-commit-id: 6cc9f69555 [formerly d772e2b49b] [formerly 6cc9f69555 [formerly d772e2b49b] [formerly fde392dcd1 [formerly 855c5410fc4bf2e33f6dcd560f0c8441199ad0ad]]]
Former-commit-id: fde392dcd1
Former-commit-id: 1cb49c6d8d [formerly d1f5016eb9]
Former-commit-id: 94789ea5cf
|
2014-06-04 16:26:25 -05:00 |
|
Greg Armendariz
|
86e574ea33
|
Omaha #3227 - Add memory check to capture script
Change-Id: Icce56d22be3c785ccfe41903b01eabdbe49c5475
Former-commit-id: 59f25a8790 [formerly 5b1f81551c] [formerly 59f25a8790 [formerly 5b1f81551c] [formerly fc88788547 [formerly 2d72889bf873c08cef82b2dd01f91e14d04ddc62]]]
Former-commit-id: fc88788547
Former-commit-id: 8296281614 [formerly 87c4971f59]
Former-commit-id: 92d41cefe3
|
2014-06-04 10:00:59 -05:00 |
|
Ron Anderson
|
3302fa4262
|
Omaha #3071 Fix error in IFPGridDatabase found in code review
Change-Id: I7bdab6085d49f0ed3667cc4d27dc58aae24d0bcf
Former-commit-id: 78b8fe9f92 [formerly cf44e1835a] [formerly 78b8fe9f92 [formerly cf44e1835a] [formerly 03b44f91d0 [formerly 97dd32f3ee5393e419ca7794eb2f564a4941494e]]]
Former-commit-id: 03b44f91d0
Former-commit-id: f20370609d [formerly dec1fa7dd4]
Former-commit-id: 05ccbd5461
|
2014-06-03 14:15:51 -05:00 |
|
Nate Jensen
|
f7248a2ad1
|
Merge "Omaha #3226 moved ost lightning code to new plugin" into omaha_14.4.1
Former-commit-id: abb63ad32d [formerly c3b8358eb6] [formerly abb63ad32d [formerly c3b8358eb6] [formerly 364e6ea94a [formerly 87eef5bc338290f252879801b86e6df64b7c6f1c]]]
Former-commit-id: 364e6ea94a
Former-commit-id: ec6d669c18 [formerly a54e6006da]
Former-commit-id: 9e7a9c6d91
|
2014-06-03 08:09:16 -05:00 |
|
Ron Anderson
|
b98936356f
|
Omaha #3052 Improved TopoQuery error handling to throw exceptions with useful error messages.
Change-Id: Ic181682611801ea244b986e8a2ce1400c4dc15d1
Former-commit-id: bd50ae9854 [formerly 3f169399b8] [formerly bd50ae9854 [formerly 3f169399b8] [formerly 304364e356 [formerly 0d42d4fdc56122c3df912c93e5e09b0ab28c1b37]]]
Former-commit-id: 304364e356
Former-commit-id: 060b0221fa [formerly 3ff441f9da]
Former-commit-id: 7171bc6f0a
|
2014-06-02 17:14:18 -05:00 |
|
Brian Clements
|
6a7d8a4f36
|
Omaha #3226 moved ost lightning code to new plugin
fixed NPE when missing encryption config
Change-Id: I8ef6004f44b686918220e7729a499e456787a834
Former-commit-id: 0f029c3015 [formerly 664d9282c3] [formerly 0f029c3015 [formerly 664d9282c3] [formerly 6b09d9b3c5 [formerly 5421b666fc52e849e4ad5b39e2328a5c90a42408]]]
Former-commit-id: 6b09d9b3c5
Former-commit-id: a4bebe81df [formerly 7ff77c5960]
Former-commit-id: 2ef88ef15d
|
2014-06-02 15:33:41 -05:00 |
|
Nate Jensen
|
0a9b66d713
|
Merge "Omaha #3211 fix edex startup issues" into omaha_14.4.1
Former-commit-id: 21468f0f2d [formerly ff799b8044] [formerly 21468f0f2d [formerly ff799b8044] [formerly 9269a938ce [formerly 367289573446fcb10678af38ce36ab8797889a6d]]]
Former-commit-id: 9269a938ce
Former-commit-id: 2e6bd78c02 [formerly 71981cb7ae]
Former-commit-id: 90ade0bba0
|
2014-06-02 14:43:34 -05:00 |
|
cmadmin
|
06e9bf0c1c
|
Merge "Omaha #3132 Fix ohd merge issues." into omaha_14.4.1
Former-commit-id: 05dac7601b [formerly e5ffd0f40c] [formerly 05dac7601b [formerly e5ffd0f40c] [formerly 75ee567f85 [formerly b57f019ff57da1193823bcba75698077f7c7e6b4]]]
Former-commit-id: 75ee567f85
Former-commit-id: abf7fa2bdc [formerly 447e46f682]
Former-commit-id: fc269f33dd
|
2014-06-02 13:59:15 -05:00 |
|
Ron Anderson
|
13aa4a3a53
|
Omaha #3132 Fix ohd merge issues.
Change-Id: I9cd7f10b55d4e599152827e4f5a793be11ce37fc
Former-commit-id: 8ef6180ac2 [formerly 0c569e6249] [formerly 8ef6180ac2 [formerly 0c569e6249] [formerly c294a06b72 [formerly 5b3b83fe73b905c1d3e3743baf632e1364475eaf]]]
Former-commit-id: c294a06b72
Former-commit-id: 87ab046a05 [formerly 9343611362]
Former-commit-id: b713ab7c29
|
2014-06-02 13:40:26 -05:00 |
|
Ron Anderson
|
beed49c255
|
Merge "Omaha #3071 Fix several errors identified by the log tool" into omaha_14.4.1
Former-commit-id: 0d44ffc6dc [formerly f5a89ce811] [formerly 0d44ffc6dc [formerly f5a89ce811] [formerly d301a71c9a [formerly 8c710088b9d9539c240de61b7d58963d3b83326e]]]
Former-commit-id: d301a71c9a
Former-commit-id: 56046abf71 [formerly d36b37ade6]
Former-commit-id: 2d9e212cc6
|
2014-06-02 13:37:41 -05:00 |
|
Nate Jensen
|
3f9512f549
|
Omaha #3211 fix edex startup issues
Change-Id: I634ec432e7136e191706d4b8b7063d845dd9fb7c
Former-commit-id: 6e85b66b1b [formerly f973ce1bbe] [formerly 6e85b66b1b [formerly f973ce1bbe] [formerly cf5a1d16c9 [formerly dd5cabbc335662e0583b76a5bef6bfdf28569735]]]
Former-commit-id: cf5a1d16c9
Former-commit-id: 4cf6224645 [formerly 25ec0697ae]
Former-commit-id: 25d09c4183
|
2014-06-02 12:39:34 -05:00 |
|
Steve Harris
|
346c44507b
|
Omaha #3132 - ohd merge core files should go in ufcore
Former-commit-id: ff567e9e38 [formerly 69d0ad089e] [formerly ff567e9e38 [formerly 69d0ad089e] [formerly 97523137b9 [formerly 6e27d0eb0461e3c3d64b04f8179f946d973251f1]]]
Former-commit-id: 97523137b9
Former-commit-id: e008b73269 [formerly bf3d13609b]
Former-commit-id: 4620d946ee
|
2014-06-02 12:11:00 -05:00 |
|
Ron Anderson
|
3ae7d21833
|
Omaha #3071 Fix several errors identified by the log tool
Change-Id: I98aa1101fa796bd4ad93d2b8556248bbd13219e4
Former-commit-id: 8daa3bac9c [formerly 9ebbc261b1] [formerly 8daa3bac9c [formerly 9ebbc261b1] [formerly ca0946b5f8 [formerly ca6a36be221da70cd766c6e844e2852bd67f69c3]]]
Former-commit-id: ca0946b5f8
Former-commit-id: e28633a781 [formerly b45048f5bf]
Former-commit-id: 674baaeabc
|
2014-06-02 12:08:35 -05:00 |
|
Steve Harris
|
7eabeb7ad6
|
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: 647cd97e29 [formerly 7fec0d039c] [formerly 647cd97e29 [formerly 7fec0d039c] [formerly 455eb8b39d [formerly 45250149681f057cf168f4d3cb27276279f62c05]]]
Former-commit-id: 455eb8b39d
Former-commit-id: 373c816e6a [formerly ec743199f1]
Former-commit-id: cbceb4ea62
|
2014-06-02 11:21:46 -05:00 |
|
Steve Harris
|
9aa3a5a035
|
Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1
Former-commit-id: 4e26e224fd [formerly 65a3390a6a] [formerly 4e26e224fd [formerly 65a3390a6a] [formerly 3bde6b3e41 [formerly ee696cb24c8d72f0562126a131824e958b88f090]]]
Former-commit-id: 3bde6b3e41
Former-commit-id: 0edb16b05e [formerly c3deafc840]
Former-commit-id: 46b7122d56
|
2014-06-02 07:31:14 -05:00 |
|
Brian.Dyke
|
9351315fd6
|
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: a0a879be7d [formerly a8737e18f0] [formerly a0a879be7d [formerly a8737e18f0] [formerly 3f1e12effc [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]
Former-commit-id: 3f1e12effc
Former-commit-id: 3961c75ecd [formerly 66aacd6578]
Former-commit-id: a23d371522
|
2014-05-30 10:46:25 -04:00 |
|
Richard Peter
|
aaab5e310f
|
Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289
Former-commit-id: 3beef299b1 [formerly 558699a370] [formerly 3beef299b1 [formerly 558699a370] [formerly e2288769d3 [formerly b48d9bd6affc340ef4791c99cbc95f122c4a69f8]]]
Former-commit-id: e2288769d3
Former-commit-id: 121f0e00a4 [formerly 220f7aa97a]
Former-commit-id: 8ba13f812e
|
2014-05-29 15:50:59 -05:00 |
|
Nate Jensen
|
c3e98aca83
|
Omaha #3211 changes to support improved authentication/authorization
Change-Id: If793dcbe3bed741f1b75ce338b152eb69d845172
Former-commit-id: e4029da3dc [formerly 4fdb6df9a1] [formerly e4029da3dc [formerly 4fdb6df9a1] [formerly 1e362625e5 [formerly c4eeb1730778f7f18aa4d74587ebcddb3932c6e6]]]
Former-commit-id: 1e362625e5
Former-commit-id: 4351e8a13d [formerly 5a484063ac]
Former-commit-id: a834abb826
|
2014-05-29 15:28:53 -05:00 |
|
Richard Peter
|
c5a6c313f3
|
Merge "Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository" into omaha_14.4.1
Former-commit-id: 82bf2b9e94 [formerly 9cd8710876] [formerly 82bf2b9e94 [formerly 9cd8710876] [formerly 1c04a15ec7 [formerly df4e87624ad0bc6db759677435e7c276f500d3da]]]
Former-commit-id: 1c04a15ec7
Former-commit-id: 2d9d34fb7b [formerly bd5bb6daaa]
Former-commit-id: 9aa0ecec3f
|
2014-05-29 14:13:54 -05:00 |
|
Nate Jensen
|
a49343ddbf
|
Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1
Former-commit-id: a709601e2f [formerly 5cfbcb7e98] [formerly a709601e2f [formerly 5cfbcb7e98] [formerly c43a2bf217 [formerly 5f72fc0a65a1b3b64298a2aacaa18ab84c8df93e]]]
Former-commit-id: c43a2bf217
Former-commit-id: 9804b35063 [formerly c1d092a55d]
Former-commit-id: b4b684876a
|
2014-05-29 13:51:09 -05:00 |
|
Steve Harris
|
b09109b66e
|
Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository
Change-Id: Ib313d71006c3d23a76c1589fded47102fea80b9a
Former-commit-id: f857812561 [formerly 79d5592fdf] [formerly f857812561 [formerly 79d5592fdf] [formerly 5bc251beaa [formerly c944b3b98f68b8f65b853fb244002e3382dc38a2]]]
Former-commit-id: 5bc251beaa
Former-commit-id: 4af6e9f137 [formerly c830097b13]
Former-commit-id: 77e18c2e9a
|
2014-05-29 13:42:09 -05:00 |
|
Brian Clements
|
b99b43e383
|
Omaha #3179 moved ebxml ecludes from datadelivery to registry modes
Change-Id: Id95a5b7ca307a52a2ae271becfc73c4fccef12de
Former-commit-id: 32cf8deb3a [formerly fb71fae2d1] [formerly 32cf8deb3a [formerly fb71fae2d1] [formerly 5abe7ea99d [formerly f3baedf6187a70e9c98d73b6819fa46e9c00c702]]]
Former-commit-id: 5abe7ea99d
Former-commit-id: dc1e069853 [formerly 14a50e4c3d]
Former-commit-id: 1a9aeb2ebd
|
2014-05-29 11:58:10 -05:00 |
|
Brian Clements
|
1ee9485a43
|
Omaha #3179 added modes directory to custom targets
Change-Id: I43587e7d33cddd8dcd4b8056c90cc88bd78df1fe
Former-commit-id: 04cba3e10e [formerly a1da843e2a] [formerly 04cba3e10e [formerly a1da843e2a] [formerly 77276d6efb [formerly 3d324c5b62a1f960099a5515cbd7c588ce7c5d7f]]]
Former-commit-id: 77276d6efb
Former-commit-id: 100c89ab9c [formerly 95088ed28d]
Former-commit-id: 0778629505
|
2014-05-29 09:08:53 -05:00 |
|
Brian Clements
|
fe7c15daa4
|
Omaha #2536 merge autobldsrv into text plugins
Change-Id: I4a149b9f16dcc868274bca7e2f4de3d4dad78e52
Former-commit-id: 4aade4bf2e [formerly 5d0eaf02ab] [formerly 4aade4bf2e [formerly 5d0eaf02ab] [formerly 542d36f107 [formerly 5ae9b617dfeb4ff809916706ac1e849f762bd5a2]]]
Former-commit-id: 542d36f107
Former-commit-id: 5a52531828 [formerly fcadd3dae9]
Former-commit-id: 7d841b655c
|
2014-05-29 08:19:47 -05:00 |
|
Ben Steffensmeier
|
f1aaf45669
|
Omaha #2990 Fix radar mesocyclone regex.
Former-commit-id: 5404dd5f83 [formerly c7c6c1b7ec] [formerly 5404dd5f83 [formerly c7c6c1b7ec] [formerly cd6ba70787 [formerly 8e03f08f2d01f8b47101c09f950a0830cf8f0bb6]]]
Former-commit-id: cd6ba70787
Former-commit-id: 757d792236 [formerly f669f3e22a]
Former-commit-id: 5ffb664f27
|
2014-05-28 16:40:35 -05:00 |
|
Nate Jensen
|
4269bec13b
|
Merge "Omaha #3179 split modes.xml into plugin modes files" into omaha_14.4.1
Former-commit-id: a27988ec2c [formerly 942aa72b01] [formerly a27988ec2c [formerly 942aa72b01] [formerly 6beda0c45b [formerly eec07fb20d6566b1e1d361ef971e50e5a019fcbf]]]
Former-commit-id: 6beda0c45b
Former-commit-id: 125b98b6ce [formerly cff4bfc6f4]
Former-commit-id: c3e036884b
|
2014-05-28 13:42:07 -05:00 |
|
Brian Clements
|
902e576373
|
Omaha #3179 split modes.xml into plugin modes files
Change-Id: I31e59b28fca166aff0cbd9ca13bf81aa67d6b46a
Former-commit-id: 2baee319de [formerly 5e39a68498] [formerly 2baee319de [formerly 5e39a68498] [formerly 334bb53dea [formerly e626f47c9bb8900af2f4734513b2c94b83f082c8]]]
Former-commit-id: 334bb53dea
Former-commit-id: f2db2d8fef [formerly d79c63a429]
Former-commit-id: 2dcbd33a4e
|
2014-05-28 13:32:18 -05:00 |
|
Nate Jensen
|
d1f08dcaf1
|
Merge "Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager." into omaha_14.4.1
Former-commit-id: 6fc643af39 [formerly 3e174fe39c] [formerly 6fc643af39 [formerly 3e174fe39c] [formerly 8cc13d8334 [formerly db3ff4b3bf81cbea49169369be01ce5c919157fd]]]
Former-commit-id: 8cc13d8334
Former-commit-id: c7da2eec51 [formerly a921570418]
Former-commit-id: fda484c9ff
|
2014-05-28 12:43:12 -05:00 |
|
Roger Ferrel
|
b9f63efb1c
|
Omaha #3137 - Add checks to prevent NullPointerException.
Former-commit-id: d901d99bde [formerly 3331d58e1c] [formerly d901d99bde [formerly 3331d58e1c] [formerly b235e56e28 [formerly 42dcb85d536485f3ae244e69a315e88169d04c97]]]
Former-commit-id: b235e56e28
Former-commit-id: ac2a7ddca7 [formerly 009f4b8d21]
Former-commit-id: 02ad70e080
|
2014-05-28 09:54:37 -05:00 |
|
Steve Harris
|
02babdd057
|
Omaha #3132 - new TPCSurgeProb files should have gone to core in the merge
Former-commit-id: b87e3463e7 [formerly 63020bd766] [formerly b87e3463e7 [formerly 63020bd766] [formerly 66e157489e [formerly 80da354c8bacab21dc0675f280989c2d8e15acd4]]]
Former-commit-id: 66e157489e
Former-commit-id: f844acd104 [formerly 71d69e5d25]
Former-commit-id: 3aef3934a3
|
2014-05-28 09:32:43 -05:00 |
|
Steve Harris
|
5fda99b1fe
|
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: 718c78d984 [formerly be80bd01f3] [formerly 718c78d984 [formerly be80bd01f3] [formerly dc74953978 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]
Former-commit-id: dc74953978
Former-commit-id: 0e9d0b2ef5 [formerly 713cfeffc7]
Former-commit-id: 6412cc1427
|
2014-05-28 09:01:00 -05:00 |
|
Steve Harris
|
1f24080b8e
|
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: a4825f4b27 [formerly 2c49d14c12] [formerly a4825f4b27 [formerly 2c49d14c12] [formerly 048d3748b7 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]]
Former-commit-id: 048d3748b7
Former-commit-id: 005e5b4ee2 [formerly 4ed44b6e72]
Former-commit-id: 95462b4f80
|
2014-05-28 07:41:42 -05:00 |
|
Ben Steffensmeier
|
566094598d
|
Omaha #2668 add support for data access framework to bufrua.
Former-commit-id: 6d2db6c21f [formerly 2c9de12c6f] [formerly 6d2db6c21f [formerly 2c9de12c6f] [formerly 0138296c13 [formerly 8ef33409df31f8ab9d69828b2d13e1bd8e979685]]]
Former-commit-id: 0138296c13
Former-commit-id: deea388b89 [formerly 79410db3d8]
Former-commit-id: f22960be7b
|
2014-05-27 15:16:08 -05:00 |
|
Steve Harris
|
172cca39d9
|
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 3de24b7b07 [formerly 99bc6f990c] [formerly 3de24b7b07 [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: bfa4255eea [formerly 9b98b41cd4]
Former-commit-id: 144354c369
|
2014-05-27 14:48:24 -04:00 |
|
Slav Korolev
|
bcc5a458b3
|
Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager.
Former-commit-id: adba0cd20a [formerly e3fe3c9736] [formerly adba0cd20a [formerly e3fe3c9736] [formerly 81033087ea [formerly 14ff7a84235ed8cc95aca488910e7f975a5bd41e]]]
Former-commit-id: 81033087ea
Former-commit-id: 55b01dce6d [formerly 4a8e7fc38e]
Former-commit-id: ced313a7f1
|
2014-05-27 12:24:50 -04:00 |
|
Brian Clements
|
d63e1eaa22
|
Omaha #3199 new edex.soap plugin
new plugin for soap utilities
Former-commit-id: a94cf29ab5 [formerly 4b984b2d70] [formerly a94cf29ab5 [formerly 4b984b2d70] [formerly 09fba26a56 [formerly 7c7f7f4f4a821a80d0bf6dcb7e59e3880a7bf4e2]]]
Former-commit-id: 09fba26a56
Former-commit-id: a02928d703 [formerly f934e868ec]
Former-commit-id: 161a6b1624
|
2014-05-23 14:51:20 -05:00 |
|
Steve Harris
|
e8a843b719
|
Merge branch 'omaha_14.3.1' (14.3.1-6) into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml
Former-commit-id: 498ff9235d [formerly 211e5f8197] [formerly 498ff9235d [formerly 211e5f8197] [formerly 7da3d7461f [formerly c678b56c81cb5ff798b5fcea75e00473c39fd53e]]]
Former-commit-id: 7da3d7461f
Former-commit-id: aebe44aec5 [formerly 51f8c81f33]
Former-commit-id: 0b84c2ea74
|
2014-05-23 08:16:43 -05:00 |
|
Steve Harris
|
d3a614b5d8
|
Merge branch 'master_14.3.1' (14.3.1-6) into omaha_14.3.1
Former-commit-id: 31711d4c5a [formerly 7dc84f4c74] [formerly 31711d4c5a [formerly 7dc84f4c74] [formerly b059918699 [formerly 36b00a413b977ef5e11a46cf6f3d575e39ee4b57]]]
Former-commit-id: b059918699
Former-commit-id: 16e2265208 [formerly 440d6b16cf]
Former-commit-id: af2f9d8a72
|
2014-05-23 08:09:39 -05:00 |
|
Nate Jensen
|
999cdf951d
|
Merge "Omaha #2913 remove some more unused uengine code." into omaha_14.4.1
Former-commit-id: f873b97ed0 [formerly add26fa7e9] [formerly f873b97ed0 [formerly add26fa7e9] [formerly 349123ba05 [formerly 3562300cb46d196f754c37516dd39e9bb81ea254]]]
Former-commit-id: 349123ba05
Former-commit-id: bc2d93434f [formerly 1369010ca0]
Former-commit-id: aa9238ac35
|
2014-05-22 18:10:10 -05:00 |
|
Ben Steffensmeier
|
f61c539090
|
Omaha #2913 remove some more unused uengine code.
Former-commit-id: 33c6867b52 [formerly be301d1dc3] [formerly 33c6867b52 [formerly be301d1dc3] [formerly 05e8d862c2 [formerly 9b72d2a1ddd7db5e06abee5bd172f700ad4c1277]]]
Former-commit-id: 05e8d862c2
Former-commit-id: 11fde3a688 [formerly ba3867af55]
Former-commit-id: 0d22a5d8c9
|
2014-05-22 17:50:16 -05:00 |
|
Nate Jensen
|
25e4982cb3
|
Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1
Former-commit-id: 730831d465 [formerly 8f6dcfaa1b] [formerly 730831d465 [formerly 8f6dcfaa1b] [formerly b67bf1e492 [formerly 34ef84d848c75826d5d8e8dd39316a6f6dcb1a4d]]]
Former-commit-id: b67bf1e492
Former-commit-id: 76a2766ed4 [formerly 935086d60e]
Former-commit-id: dcfd7a07eb
|
2014-05-22 16:46:50 -05:00 |
|
Steve Harris
|
e30dfd21ee
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
Former-commit-id: 376482d3b1 [formerly 518822ed83] [formerly 376482d3b1 [formerly 518822ed83] [formerly b6af2db9f5 [formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]]]
Former-commit-id: b6af2db9f5
Former-commit-id: 1dfc15a77e [formerly 14b1ea307f]
Former-commit-id: d226dfb021
|
2014-05-22 14:31:06 -05:00 |
|
Brian Clements
|
67376b444a
|
Omaha #3206 edex changes related to new javax.serlvet FOSS project
Former-commit-id: 0a2ddfbc79 [formerly f9de79465a] [formerly 0a2ddfbc79 [formerly f9de79465a] [formerly c875f17719 [formerly c042671ecf12a6fa46e35d4954d23492f35b7c76]]]
Former-commit-id: c875f17719
Former-commit-id: 53de96dd53 [formerly fd9f98b2ba]
Former-commit-id: e7730e2219
|
2014-05-22 14:09:07 -05:00 |
|
Steve Harris
|
5aca60f422
|
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
Former-commit-id: 0a3b23d055 [formerly 4899c4f56a] [formerly 0a3b23d055 [formerly 4899c4f56a] [formerly 2059fc9c0e [formerly eae5c3e75061566e40194730c2cfb2003d952e62]]]
Former-commit-id: 2059fc9c0e
Former-commit-id: 805aae1a70 [formerly 0df4af413b]
Former-commit-id: e7e48b2abb
|
2014-05-22 14:05:06 -05:00 |
|
Stephen Gilbert
|
e2f79fb8a8
|
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: 651f6a2e9c [formerly 8a3ab16e46] [formerly 651f6a2e9c [formerly 8a3ab16e46] [formerly e73836f3b5 [formerly d2d54ee2bfbbe6fef44df58d2edc3b5858ffbe22]]]
Former-commit-id: e73836f3b5
Former-commit-id: 71730ae2ec [formerly 571cc69cf3]
Former-commit-id: 98c83bf2d8
|
2014-05-22 13:31:12 -04:00 |
|