Roger Ferrel
|
b575bb7de2
|
Omaha #3098 Changes to also look at 'Wx' occasional (TEMPO) data.
Change-Id: Ide97fbfd93bf06a6d708bf6fbd74349000ba2ed5
Former-commit-id: 7510cc23af [formerly e1c011b157] [formerly 7510cc23af [formerly e1c011b157] [formerly 10e7a33f08 [formerly 3e976b7ed5cf46687bbb76073e53f35ffc2c2812]]]
Former-commit-id: 10e7a33f08
Former-commit-id: e799ce4c59 [formerly aa085d9e59]
Former-commit-id: 050c2e87e7
|
2014-06-04 08:14:06 -05:00 |
|
Nate Jensen
|
e50c616257
|
Merge "Omaha #3163 Fix collaboration string differencing" into omaha_14.4.1
Former-commit-id: e12a0ef8df [formerly fbad2f72d5] [formerly e12a0ef8df [formerly fbad2f72d5] [formerly f75a57ac23 [formerly 4535b6ce392515daa465f395fb002b9c4116c111]]]
Former-commit-id: f75a57ac23
Former-commit-id: 296b381544 [formerly eaa8958ce2]
Former-commit-id: 909d6d5a42
|
2014-06-03 16:17:34 -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 |
|
Ben Steffensmeier
|
f403929612
|
Omaha #3163 Fix collaboration string differencing
Former-commit-id: 2c534e177e [formerly ca2210b3e7] [formerly 2c534e177e [formerly ca2210b3e7] [formerly 310e6562e6 [formerly e6f30c822de26bafae339a8871c4ba98100e6d1a]]]
Former-commit-id: 310e6562e6
Former-commit-id: 2b82c39a59 [formerly 72f1d7c950]
Former-commit-id: b40e97f5ac
|
2014-06-03 13:51:46 -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 |
|
Steve Harris
|
c3f50edb0d
|
Merge branch 'omaha_14.3.1' (14.3.1-9) into omaha_14.4.1
Former-commit-id: 0255196956 [formerly 08b88a11ab] [formerly 0255196956 [formerly 08b88a11ab] [formerly e24931a7f9 [formerly 7ab6907a20cb77106a26e528abcc83c961a2ed84]]]
Former-commit-id: e24931a7f9
Former-commit-id: ea54d3a2cf [formerly 54ba5cf81b]
Former-commit-id: 4b3fc74450
|
2014-06-02 14:34:53 -05:00 |
|
Steve Harris
|
372e442eb4
|
Merge branch 'master_14.3.1' (14.3.1-9) into omaha_14.3.1
Former-commit-id: 49732fbdb2 [formerly b3b768ee87] [formerly 49732fbdb2 [formerly b3b768ee87] [formerly 78fc4d83f9 [formerly 4618c3ab6ae346649438d497712e4a8ab2ae91bd]]]
Former-commit-id: 78fc4d83f9
Former-commit-id: 61758b5fda [formerly e6f5716104]
Former-commit-id: 7cf41604ff
|
2014-06-02 14:29:39 -05:00 |
|
Steve Harris
|
4a8e870d72
|
Issue #2754 - added .project file to ohd/com.raytheon.uf.edex.ohd.feature/
Former-commit-id: f4ff7a4d9c [formerly 4c41c736b1] [formerly f4ff7a4d9c [formerly 4c41c736b1] [formerly 29e4453e2b [formerly dd6245e5abd2973fd47e0cc5ca1b79470122181c]]]
Former-commit-id: 29e4453e2b
Former-commit-id: 8bca727f50 [formerly bcaeec11a1]
Former-commit-id: 2f86829213
|
2014-06-02 14:04:01 -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
|
cf3a5b9a53
|
Merge "Omaha #2918 Synchronize mosaic dataTimes." into omaha_14.4.1
Former-commit-id: 4be10cf1e6 [formerly d94a040f29] [formerly 4be10cf1e6 [formerly d94a040f29] [formerly a862846e15 [formerly 4abb30354ef4f6c6520ee993a66371656db0db9f]]]
Former-commit-id: a862846e15
Former-commit-id: 711661870f [formerly 1f4daca6e3]
Former-commit-id: ba546c3001
|
2014-06-02 12:44:17 -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 |
|
Ben Steffensmeier
|
25b2aeeed2
|
Omaha #2918 Synchronize mosaic dataTimes.
Former-commit-id: 93ce7ddb33 [formerly 8a117864d8] [formerly 93ce7ddb33 [formerly 8a117864d8] [formerly b078baf67d [formerly c4d8ed9d0d7eb4c17d8a0922302a3fc50a0ae383]]]
Former-commit-id: b078baf67d
Former-commit-id: a97f9cd7e6 [formerly b4e1a98e23]
Former-commit-id: cbe8c64e73
|
2014-06-02 10:41:45 -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
|
106a921a4c
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: de2df4cb6f [formerly b8ba378862] [formerly de2df4cb6f [formerly b8ba378862] [formerly c6244e1950 [formerly dec7b6fa091cab098b89a51551fa46b9f28b959b]]]
Former-commit-id: c6244e1950
Former-commit-id: 30f72a9337 [formerly 6edbd149a5]
Former-commit-id: 45deec5df6
|
2014-06-02 07:01:37 -04:00 |
|
Ron Anderson
|
14f0f927bf
|
Omaha #2841 Fix errors when formatters fail to queue due to pending limit.
Change-Id: Icf70e25369a23b7b554718cf235feda02e615f0d
Former-commit-id: 916e607254 [formerly 1108744b40] [formerly 916e607254 [formerly 1108744b40] [formerly 22d67fcad1 [formerly b15cb1632b58c415399ccc8dee6cf2c13140355f]]]
Former-commit-id: 22d67fcad1
Former-commit-id: 808254cd31 [formerly 33abe4a8d3]
Former-commit-id: ecaa8ab0a9
|
2014-05-30 10:47:28 -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 |
|
Ron Anderson
|
9d6658f1e9
|
Merge "Omaha #2841 Separate queuing of text formatters and product scripts." into omaha_14.4.1
Former-commit-id: 27a9790684 [formerly 8309a5656a] [formerly 27a9790684 [formerly 8309a5656a] [formerly 7df866b471 [formerly e13f80b81df762d6658cce9ad534dc499791ba46]]]
Former-commit-id: 7df866b471
Former-commit-id: f1a6e6735c [formerly ff31990a13]
Former-commit-id: 30495f52db
|
2014-05-29 18:50:52 -05:00 |
|
Ron Anderson
|
0c06544416
|
Omaha #2841 Separate queuing of text formatters and product scripts.
Change-Id: I4bfab25d4563914e7390b59d1717e8c82b016eb8
Former-commit-id: ce4047869c [formerly a9f3b486f3] [formerly ce4047869c [formerly a9f3b486f3] [formerly 8e1f4331da [formerly 216be7d4dd6da9aefbdd6c55e9fd09f1a60bc53a]]]
Former-commit-id: 8e1f4331da
Former-commit-id: 4d32cb561d [formerly f765c74e5e]
Former-commit-id: 114532dd8d
|
2014-05-29 16:55:02 -05: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 |
|
Richard Peter
|
735f0ca8b1
|
Merge "Omaha #3210 - moving foss from cots/ into AWIPS2_foss repository" into omaha_14.4.1
Former-commit-id: af040cffa8 [formerly fca34641a0] [formerly af040cffa8 [formerly fca34641a0] [formerly 0c8e7e05bd [formerly 933f04911ad40e66f49da96c872306f4e89a2eca]]]
Former-commit-id: 0c8e7e05bd
Former-commit-id: 30a41336d9 [formerly 82621fce98]
Former-commit-id: 6a39acde82
|
2014-05-29 14:01:22 -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 |
|
Roger Ferrel
|
c882871747
|
Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085
Former-commit-id: eebc5096b2 [formerly 44a23b4500] [formerly eebc5096b2 [formerly 44a23b4500] [formerly 825e2c1b19 [formerly 1249deb91b6463044a59ca564e26f82612f52d40]]]
Former-commit-id: 825e2c1b19
Former-commit-id: 73be1f66e9 [formerly 15545c5239]
Former-commit-id: 6c78b5e04c
|
2014-05-29 12:33:15 -05:00 |
|
Steve Harris
|
bdb969ecef
|
Omaha #3210 - moving foss from cots/ into AWIPS2_foss repository
Former-commit-id: 119df754b6 [formerly 24de47720f] [formerly 119df754b6 [formerly 24de47720f] [formerly 9396273e49 [formerly 762b2ad4da3ab2944b0df17ce655bcc60d02bdc3]]]
Former-commit-id: 9396273e49
Former-commit-id: a9b3c772f0 [formerly 7c21bd17e6]
Former-commit-id: b9c03ee844
|
2014-05-29 12:00:50 -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 |
|
Brian Clements
|
927857cbd7
|
Omaha #3152 modified rcm build to deploy logback instead of log4j
Change-Id: I829bea003053d5f2b0cf17234fc26a8ff35334ac
Former-commit-id: 3b2acfc091 [formerly c227a54da0] [formerly 3b2acfc091 [formerly c227a54da0] [formerly 190e877633 [formerly d9c3f3845e51f5892c80ec6e4b8ed6efc2769d0e]]]
Former-commit-id: 190e877633
Former-commit-id: eb101fbafd [formerly 16e80de9b4]
Former-commit-id: 0dcd0ebd4e
|
2014-05-28 12:17:39 -05:00 |
|
Ron Anderson
|
c237fd2699
|
Merge "Omaha #3110 Permanent fix for mutable database creation." into omaha_14.4.1
Former-commit-id: 8b580a891d [formerly da0a173698] [formerly 8b580a891d [formerly da0a173698] [formerly 8b5daad4db [formerly 3869a36a6cad1674e8ec493d03937c21ddde7f21]]]
Former-commit-id: 8b5daad4db
Former-commit-id: 0198ceb40a [formerly 191283e96d]
Former-commit-id: 81c044d476
|
2014-05-28 11:59:51 -05:00 |
|
Richard Peter
|
984dc458b9
|
Merge "Omaha #3137 - Add checks to prevent NullPointerException." into omaha_14.4.1
Former-commit-id: 37ae3d341c [formerly daaaed85d5] [formerly 37ae3d341c [formerly daaaed85d5] [formerly 6a01bcd3b0 [formerly 93ab5e949da1f654ea15a2044b587125f3243ebc]]]
Former-commit-id: 6a01bcd3b0
Former-commit-id: 8691da5fec [formerly 4299d5cb18]
Former-commit-id: 5a0de0ff06
|
2014-05-28 11:07:41 -05:00 |
|
Nate Jensen
|
d7cba4a465
|
Merge "Omaha #3133 Removed dead hydro code and related dependencies" into omaha_14.4.1
Former-commit-id: 719c53a044 [formerly 905fa8f283] [formerly 719c53a044 [formerly 905fa8f283] [formerly e7dc89cddd [formerly 55cf25f0671f17e667f7c785f3580a93267f8790]]]
Former-commit-id: e7dc89cddd
Former-commit-id: 3f434ea6e9 [formerly 05b1401849]
Former-commit-id: e4df449f49
|
2014-05-28 10:28:49 -05:00 |
|
Ron Anderson
|
1f4bde25d9
|
Omaha #3110 Permanent fix for mutable database creation.
Former-commit-id: 17da90e8db [formerly 4633de4ea3] [formerly 17da90e8db [formerly 4633de4ea3] [formerly b7271025f9 [formerly a0001c9ed3d414237069f43a29dd907111c16832]]]
Former-commit-id: b7271025f9
Former-commit-id: 3e5acbf168 [formerly f2733999de]
Former-commit-id: b6b463682f
|
2014-05-28 10:09: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 |
|