David Friedman
|
39c7024668
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: ea1e9feb1d [formerly a2dfe8e8f6] [formerly ea1e9feb1d [formerly a2dfe8e8f6] [formerly ea9230b37c [formerly 6bfa1d6662b00925814be7126592bbe340651649]]]
Former-commit-id: ea9230b37c
Former-commit-id: 10114b0bd1 [formerly bc22f7309c]
Former-commit-id: bfc3fa98b4
|
2014-08-28 15:43:32 +00:00 |
|
Nate Jensen
|
2db6fa9583
|
Merge "Omaha #3503 Composite product generators init after spring beans are loaded" into omaha_14.4.1
Former-commit-id: fb0829fd4d [formerly de69231d3a] [formerly fb0829fd4d [formerly de69231d3a] [formerly afe94aca08 [formerly 1eb554cd30d53daf44de42e0ddd3f35bf8f37bae]]]
Former-commit-id: afe94aca08
Former-commit-id: da6259a198 [formerly 8952d15b12]
Former-commit-id: f3454a7941
|
2014-08-28 10:40:50 -05:00 |
|
Brian.Dyke
|
c5aec69ab3
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 76bd6575b6 [formerly 47ae6015e5] [formerly 76bd6575b6 [formerly 47ae6015e5] [formerly a24794ca7b [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]]]
Former-commit-id: a24794ca7b
Former-commit-id: 065b05e38c [formerly 0e9a17540d]
Former-commit-id: bab69f3764
|
2014-08-28 11:39:48 -04:00 |
|
Nate Jensen
|
94cf9816c7
|
Merge "Omaha #3453 Added the spell check dictionary to site level localization." into omaha_14.4.1
Former-commit-id: 7bf0d7cd2a [formerly 2710aed225] [formerly 7bf0d7cd2a [formerly 2710aed225] [formerly 8536f6681a [formerly 2bac6ff5e600218f61343a7dc0f540c27f291924]]]
Former-commit-id: 8536f6681a
Former-commit-id: f5810478ef [formerly 3ddebb2170]
Former-commit-id: 288db1aea0
|
2014-08-27 16:27:40 -05:00 |
|
Roger Ferrel
|
87b0200274
|
Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml.
Former-commit-id: 0147449477 [formerly fa42c4069a] [formerly 0147449477 [formerly fa42c4069a] [formerly 9154ef60bb [formerly 474e07b299246aee4e6b214226c176c4a10aa866]]]
Former-commit-id: 9154ef60bb
Former-commit-id: 17a8bd795d [formerly 63a1b2890b]
Former-commit-id: 6e695a12d1
|
2014-08-27 15:06:52 -05:00 |
|
Brian Clements
|
0efea299ab
|
Omaha #3562 jetty upgrade change for dataserver
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663
Former-commit-id: ab4eaee171 [formerly 3595bd2728] [formerly ab4eaee171 [formerly 3595bd2728] [formerly 66da9e63b7 [formerly bb90464f68d562105809ef36f88869ff4570095c]]]
Former-commit-id: 66da9e63b7
Former-commit-id: aa4dc98be0 [formerly 3efcaa6a8e]
Former-commit-id: 7a990efc0c
|
2014-08-27 13:18:13 -05:00 |
|
Steve Harris
|
02c026ccce
|
Merge branch 'master_14.2.2' (14.2.2-30) into omaha_14.2.2
Former-commit-id: 080a50d28c [formerly 891019aadd] [formerly 080a50d28c [formerly 891019aadd] [formerly d3b18900b3 [formerly 579781387325a36e27135b8384b2a8b14cb38317]]]
Former-commit-id: d3b18900b3
Former-commit-id: 60d5eec1b0 [formerly 683c32dc70]
Former-commit-id: 3efff5ee42
|
2014-08-27 11:34:06 -05:00 |
|
Brian.Dyke
|
7e4ab705cc
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: a08db8d73d [formerly e654318431] [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]
Former-commit-id: aa83bf804f
Former-commit-id: f90649d7e7 [formerly f7f16ff9eb]
Former-commit-id: c0dc594eda
|
2014-08-27 11:19:19 -04:00 |
|
Nate Jensen
|
ba9c46532e
|
Merge "Omaha #3539 reworked link to editor action to avoid recursion warning" into omaha_14.4.1
Former-commit-id: 697e1c0b79 [formerly 6fca563d21] [formerly 697e1c0b79 [formerly 6fca563d21] [formerly 7acf4a04b2 [formerly bdc7d4cb7873651a4b59e0b6af9bb9dae931de77]]]
Former-commit-id: 7acf4a04b2
Former-commit-id: 783a805a8a [formerly ff03dc5783]
Former-commit-id: 60b0b76d42
|
2014-08-27 09:54:49 -05:00 |
|
Nate Jensen
|
a739387842
|
Merge "Omaha #3356 configure path manager factory before spring initialization" into omaha_14.4.1
Former-commit-id: 0edb5fc46c [formerly 2d1d18b2ff] [formerly 0edb5fc46c [formerly 2d1d18b2ff] [formerly 1ad37de1ef [formerly 93e8fb3b1b27bdce2b15397e2ee7db6f1b419a05]]]
Former-commit-id: 1ad37de1ef
Former-commit-id: dc09d337f2 [formerly 571ae1d09e]
Former-commit-id: 376670d221
|
2014-08-27 09:54:24 -05:00 |
|
Nate Jensen
|
728da699ad
|
Omaha #3132 fix compilation issue from merge
Change-Id: I76e189ff871c2ca8f99806e035abb07087626fba
Former-commit-id: 2f0b209e10 [formerly 0160955244] [formerly 2f0b209e10 [formerly 0160955244] [formerly 3f7170f862 [formerly b45249baec6c6d4f77e5aeb23b910689df192c8a]]]
Former-commit-id: 3f7170f862
Former-commit-id: 66c0933713 [formerly 281f360487]
Former-commit-id: 909bc9c412
|
2014-08-26 18:22:26 -05:00 |
|
Brian Clements
|
fcb9de6bf4
|
Omaha #3539 reworked link to editor action to avoid recursion warning
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01
Former-commit-id: a39a997a8d [formerly a609334abf] [formerly a39a997a8d [formerly a609334abf] [formerly f871058f67 [formerly dcf9ea1ef4f7a7139f6c3700c04e9f9e2fda98e3]]]
Former-commit-id: f871058f67
Former-commit-id: f179d62459 [formerly e02be806d0]
Former-commit-id: aa0cdd843c
|
2014-08-26 17:22:20 -05:00 |
|
Brian Clements
|
a08ebbe0c7
|
Omaha #3503 Composite product generators init after spring beans are loaded
Change-Id: I894adbc14e1bfe183a3f7717d95dba85291a2a09
Former-commit-id: 5dc5530120 [formerly 095f84e71f] [formerly 5dc5530120 [formerly 095f84e71f] [formerly b88f012e69 [formerly f6109e74ff5e26547c8fc03d7bb5ecde1046f689]]]
Former-commit-id: b88f012e69
Former-commit-id: f29fb0a656 [formerly e6b2143a6b]
Former-commit-id: 237bdc0e2a
|
2014-08-26 17:12:34 -05:00 |
|
Nate Jensen
|
ac5a4234cb
|
Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44
Former-commit-id: f84e89b694 [formerly dbbf012a34] [formerly f84e89b694 [formerly dbbf012a34] [formerly fdc4cc60b9 [formerly 263452a82aef4756492fe02156525137b5ca09ff]]]
Former-commit-id: fdc4cc60b9
Former-commit-id: 85a17ed23f [formerly 70216d11e4]
Former-commit-id: cf2e6693ed
|
2014-08-26 16:45:00 -05:00 |
|
Steve Harris
|
9d263bc542
|
Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java
Former-commit-id: 8c5026314c [formerly 99ae9bdc10] [formerly 8c5026314c [formerly 99ae9bdc10] [formerly 038b284066 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]]
Former-commit-id: 038b284066
Former-commit-id: 1da31a86dc [formerly c8ba2b1ae6]
Former-commit-id: 84edac842e
|
2014-08-26 16:25:21 -05:00 |
|
Nate Jensen
|
c107a88f8c
|
Merge "Omaha #3368 - removing cave/hydro" into omaha_14.4.1
Former-commit-id: 41e6446b49 [formerly 704ebac10a] [formerly 41e6446b49 [formerly 704ebac10a] [formerly b92d94d19d [formerly d5db15de813a41767a1a10b0bfa07eb88c8dff6e]]]
Former-commit-id: b92d94d19d
Former-commit-id: 0eea7a1105 [formerly 08a3bcd85e]
Former-commit-id: 0e17b3331e
|
2014-08-26 13:42:13 -05:00 |
|
Nate Jensen
|
10980c927d
|
Merge "Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env" into omaha_14.4.1
Former-commit-id: e4df37dd05 [formerly 46fc72804a] [formerly e4df37dd05 [formerly 46fc72804a] [formerly 448887b913 [formerly 59c4919564db8f8ebf61fbac6ce2bdd29095479e]]]
Former-commit-id: 448887b913
Former-commit-id: ac814cc6c9 [formerly 88ac1c057c]
Former-commit-id: 6c93e01bda
|
2014-08-26 13:39:15 -05:00 |
|
Brian.Dyke
|
16dc3b41de
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 489fec4b25 [formerly 86f0ed23c1] [formerly 489fec4b25 [formerly 86f0ed23c1] [formerly b3767167c7 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]]]
Former-commit-id: b3767167c7
Former-commit-id: 1b9a28cc62 [formerly f2b9203001]
Former-commit-id: 677ce2fb94
|
2014-08-26 13:31:34 -04:00 |
|
Nate Jensen
|
411825af28
|
Merge "Omaha #3541 fixed grid coverage spring" into omaha_14.4.1
Former-commit-id: d2a653e277 [formerly 169f5729db] [formerly d2a653e277 [formerly 169f5729db] [formerly 80ab7b8e53 [formerly 99211be9635e03e7ae117ff694912f7c58e7ab44]]]
Former-commit-id: 80ab7b8e53
Former-commit-id: f3d6d3b90c [formerly b51a4ffee6]
Former-commit-id: a2784d994f
|
2014-08-26 11:34:38 -05:00 |
|
Max Schenkelberg
|
0368097265
|
Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea
Former-commit-id: dacc10bcbc [formerly 63967fbc78] [formerly dacc10bcbc [formerly 63967fbc78] [formerly 78b87b7a63 [formerly 3aff99e787a7368f40cdd161581ead2d3552118c]]]
Former-commit-id: 78b87b7a63
Former-commit-id: 0a7a2fadec [formerly 7cfc26d1d7]
Former-commit-id: 9048064741
|
2014-08-26 11:32:20 -05:00 |
|
Max Schenkelberg
|
2b110b1141
|
Omaha #3541 fixed grid coverage spring
Change-Id: I6c69cbe530daee61127e05d7f94a0e2c92ebe2e7
Former-commit-id: ac67bd42b9 [formerly f7620471da] [formerly ac67bd42b9 [formerly f7620471da] [formerly df50024b63 [formerly f2a76dfda110e231539474bffbde123fbe6313c9]]]
Former-commit-id: df50024b63
Former-commit-id: 87e1c1a257 [formerly 6aff7b7a4c]
Former-commit-id: 47f4520d7c
|
2014-08-26 11:28:42 -05:00 |
|
Steve Harris
|
868067baa1
|
Merge branch 'master_14.3.1' (c4e9d3f = 14.2.4 -> 14.3.1 'ours merge') into omaha_14.4.1
Former-commit-id: 93f812cab6 [formerly e8ffa194af] [formerly 93f812cab6 [formerly e8ffa194af] [formerly e3a6f7b58b [formerly 6306702a3bb6a58bfc7ef9a399d822950e8e9653]]]
Former-commit-id: e3a6f7b58b
Former-commit-id: 727aafe498 [formerly a4c38663f8]
Former-commit-id: 4e6bb7670e
|
2014-08-26 10:30:10 -05:00 |
|
Brian.Dyke
|
6c1e526daf
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 8ac44dfbd3 [formerly de56ccebc0] [formerly 8ac44dfbd3 [formerly de56ccebc0] [formerly 59bacf90ac [formerly b13e744dbbcc332b9efd0799e87390bdf9bb1df3]]]
Former-commit-id: 59bacf90ac
Former-commit-id: dc14c2e6ce [formerly 8c803e81d3]
Former-commit-id: c08a724cf0
|
2014-08-26 10:56:45 -04:00 |
|
Daniel.Huffman
|
8c6fd18ece
|
ASM #16715 - Reverted and augmented Cities.xml
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0
Former-commit-id: e2e132e7a5 [formerly 8962a069be] [formerly e2e132e7a5 [formerly 8962a069be] [formerly d1cd90b487 [formerly 2107976bd25c429521d4df7a92a3726a38806ba3]]]
Former-commit-id: d1cd90b487
Former-commit-id: 7d09253674 [formerly 64672eb478]
Former-commit-id: ea8ec5fbe7
|
2014-08-26 13:30:09 +00:00 |
|
Richard Peter
|
7964c0697d
|
Omaha #3541 Fix request jvm startup and build
Change-Id: I6141ef1d74430fc43ea11f296c6ab95fc4276d6f
Former-commit-id: 64683e5784 [formerly bf5f1c27a7] [formerly 64683e5784 [formerly bf5f1c27a7] [formerly f478b42e61 [formerly 1c698d67a2c0ed3b11f910b593b1bbbdb2f46a86]]]
Former-commit-id: f478b42e61
Former-commit-id: 832bd8d5e7 [formerly ef45928158]
Former-commit-id: 820fb0085e
|
2014-08-25 21:21:04 -05:00 |
|
Richard Peter
|
147856f43d
|
Merge "Omaha #3541 Updated A2 baseline to reflect request service split" into omaha_14.4.1
Former-commit-id: 64848acf9d [formerly 5cce505b7f] [formerly 64848acf9d [formerly 5cce505b7f] [formerly 651a10715a [formerly e2ed1054e382de6e3656fd9335dedc5af3692c17]]]
Former-commit-id: 651a10715a
Former-commit-id: 0992358153 [formerly eafe010aa1]
Former-commit-id: ac192a5d86
|
2014-08-25 20:43:28 -05:00 |
|
Nate Jensen
|
f42edfddbd
|
Merge "Omaha #3368 fix deploy-install for developers without ohd repo" into omaha_14.4.1
Former-commit-id: bd8e79390b [formerly 0017deea02] [formerly bd8e79390b [formerly 0017deea02] [formerly e174537a36 [formerly c9da6960b2aad034570cfa866432c9a143de47f0]]]
Former-commit-id: e174537a36
Former-commit-id: 0cf41c2936 [formerly fb52eb1083]
Former-commit-id: aeda9ad52d
|
2014-08-25 16:20:41 -05:00 |
|
Ron Anderson
|
0d75ae75e3
|
Merge "Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job" into omaha_14.4.1
Former-commit-id: 3ffadac038 [formerly 753b715493] [formerly 3ffadac038 [formerly 753b715493] [formerly 73fec5c36a [formerly 2cfb44f69025ba06e85a44e481bac1f88b851834]]]
Former-commit-id: 73fec5c36a
Former-commit-id: 0ee02920ec [formerly eabf14a6fe]
Former-commit-id: 01dcd5de10
|
2014-08-25 16:18:58 -05:00 |
|
Nate Jensen
|
cbd7d00d1f
|
Omaha #3368 fix deploy-install for developers without ohd repo
Change-Id: Ib1738ed5e11022f5fd154ea85b29019e7c290f65
Former-commit-id: db84f25bfd [formerly 86f64337ff] [formerly db84f25bfd [formerly 86f64337ff] [formerly d43f0589f7 [formerly e9d7e258c60d39ab0d043f1e1cdc0ebcaf998ccc]]]
Former-commit-id: d43f0589f7
Former-commit-id: d4f3d09f11 [formerly aed159a1e2]
Former-commit-id: abec6e86d9
|
2014-08-25 16:16:34 -05:00 |
|
Richard Peter
|
752f328338
|
Merge "Issue #3537 Fixed dirPattern in category Local." into omaha_14.2.4
Former-commit-id: ab7facb903 [formerly 4ba39c5e56] [formerly ab7facb903 [formerly 4ba39c5e56] [formerly 008a3e8f80 [formerly 5bb3f4a1215902e867d3e9ec5ca1d122067afd7e]]]
Former-commit-id: 008a3e8f80
Former-commit-id: 17c2c42cd2 [formerly 2dd7596b68]
Former-commit-id: 8e073ab401
|
2014-08-25 14:24:27 -05:00 |
|
Nate Jensen
|
626417bde9
|
Merge "Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override" into omaha_14.4.1
Former-commit-id: 76ca1815ad [formerly 2516c869d2] [formerly 76ca1815ad [formerly 2516c869d2] [formerly 1a48a8190f [formerly 5a0ccfe4b1effb0946e6d542c492bff45d6a904b]]]
Former-commit-id: 1a48a8190f
Former-commit-id: 2c09a51125 [formerly 85ececab93]
Former-commit-id: 3ece89083f
|
2014-08-25 14:14:47 -05:00 |
|
Ron Anderson
|
a46f13d161
|
Merge "Issue #3500 back port of loadConfig.py to fix gfe starup issue" into omaha_14.2.4
Former-commit-id: 03173a9fe7 [formerly 4e6bbb4be4] [formerly 03173a9fe7 [formerly 4e6bbb4be4] [formerly 4285719a08 [formerly ae980bfccfedab3091b2708fae0dc36764dbffcb]]]
Former-commit-id: 4285719a08
Former-commit-id: fe93cb7510 [formerly 6c3cafda59]
Former-commit-id: 566db58f13
|
2014-08-25 14:04:41 -05:00 |
|
Mark Peters
|
2d9e8e0553
|
Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override
Change-Id: Ic4a3a517327944f6c6ef7b20bc1774bca6c39d0e
Former-commit-id: c7486f3952 [formerly 7b37c4d188] [formerly c7486f3952 [formerly 7b37c4d188] [formerly 6634a2df01 [formerly 449f167ce1c30a595b4b673fc4d71658500e844d]]]
Former-commit-id: 6634a2df01
Former-commit-id: 1c0e5a7d35 [formerly f1d31723c7]
Former-commit-id: c069dd338a
|
2014-08-25 13:50:27 -05:00 |
|
Brian Clements
|
05bfc2943c
|
Issue #3500 back port of loadConfig.py to fix gfe starup issue
Change-Id: I841af0ac81b86e499c0b52dedab64431e7f1ecd7
Former-commit-id: 960eb2dc29 [formerly 4314f71387] [formerly 960eb2dc29 [formerly 4314f71387] [formerly cf671dcda8 [formerly 2a0af03242692708b3e752417ca7d60d28520768]]]
Former-commit-id: cf671dcda8
Former-commit-id: 253b14b895 [formerly f9756abf0a]
Former-commit-id: 7bc93588a1
|
2014-08-25 13:34:36 -05:00 |
|
Roger Ferrel
|
7a7a770dc6
|
Issue #3537 Fixed dirPattern in category Local.
Former-commit-id: 1ff321ce51 [formerly c7a6040792] [formerly 1ff321ce51 [formerly c7a6040792] [formerly e451dd2814 [formerly d40736ed992300be32ed4a62511fa436e9d167af]]]
Former-commit-id: e451dd2814
Former-commit-id: 3d3f9cfb8c [formerly 6f566c0f38]
Former-commit-id: 7e3024f4f2
|
2014-08-25 13:23:44 -05:00 |
|
Nate Jensen
|
6bb1e7d4bd
|
Merge "Issue #3500 remove locking on osgi internals, rework gfe client startup" into omaha_14.2.4
Former-commit-id: 0852d804ba [formerly 5e46c55a76] [formerly 0852d804ba [formerly 5e46c55a76] [formerly d66ac29640 [formerly bb08cb510dc3d774e040b7d3a164dfa1d581aa1c]]]
Former-commit-id: d66ac29640
Former-commit-id: d824e365d1 [formerly 5c943c5ddc]
Former-commit-id: 18902f8c9a
|
2014-08-25 13:12:46 -05:00 |
|
Ron Anderson
|
eede0b99c3
|
Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job
Change-Id: Id759e14fcec25a68add1b65e9bf48d836ada14c0
Former-commit-id: 56b553ad0d [formerly 8434195c57] [formerly 56b553ad0d [formerly 8434195c57] [formerly 606e2b210c [formerly 6b6213fe5b0ca48045fa59136b72efdf46f7e3f1]]]
Former-commit-id: 606e2b210c
Former-commit-id: 6c38d4f143 [formerly fda5c981f9]
Former-commit-id: 7799092b08
|
2014-08-25 12:39:58 -05:00 |
|
Brian Clements
|
9992138ebe
|
Omaha #2926 switched textdb to thrift client
Change-Id: I80a55506fa1e6d8780c0d3dbfb4b3c82b1aac9f1
Former-commit-id: 344ba01102 [formerly 1bbf5d7346] [formerly 344ba01102 [formerly 1bbf5d7346] [formerly c05e535cc8 [formerly 856ef48bab005bdb7de9dd4145fafc7fe12084f5]]]
Former-commit-id: c05e535cc8
Former-commit-id: 65d5085dcf [formerly 09d7136915]
Former-commit-id: 7730ba55d4
|
2014-08-25 10:28:48 -05:00 |
|
Steve Harris
|
f4883fed1e
|
Merge branch 'master_14.2.2' (14.2.2-29) into omaha_14.2.2
Former-commit-id: 8aadfe944a [formerly a03b5201cb] [formerly 8aadfe944a [formerly a03b5201cb] [formerly d850919303 [formerly 67c81cedb7321baad8dcf5fb4cea21ac152d2dcd]]]
Former-commit-id: d850919303
Former-commit-id: 28937f26bc [formerly 121a8ce866]
Former-commit-id: a45850d88e
|
2014-08-25 08:19:50 -05:00 |
|
Roger Ferrel
|
c534338504
|
Omaha #3353 Changes to remove Geospatial data set generation off the UI thread.
Change-Id: I5213f627a97a27bdb92c4857eac4071c5450b790
Former-commit-id: a610e0a34b [formerly ca3a0595d2] [formerly a610e0a34b [formerly ca3a0595d2] [formerly d0779ef059 [formerly f16a8ff2c51c392957e13ef63423abe9f99b3301]]]
Former-commit-id: d0779ef059
Former-commit-id: be7d387a4b [formerly cfe1212590]
Former-commit-id: a9d8c8f3f5
|
2014-08-25 07:59:26 -05:00 |
|
Brian.Dyke
|
d9ac0d95d4
|
Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: a841eb53e5 [formerly a4376ec79f] [formerly a841eb53e5 [formerly a4376ec79f] [formerly 0fbc5269ea [formerly e673b3ff82b52be4cd4fbe2dab0859b98678f6ef]]]
Former-commit-id: 0fbc5269ea
Former-commit-id: caa50716ff [formerly 13d523eede]
Former-commit-id: 20c4fb88d5
|
2014-08-22 16:40:51 -04:00 |
|
Brian.Dyke
|
27372f098c
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: 2ddc920a4a [formerly 325887e605] [formerly 2ddc920a4a [formerly 325887e605] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]
Former-commit-id: dd9d7133d9
Former-commit-id: c8e9153884 [formerly 1839b614df]
Former-commit-id: cd1b914f50
|
2014-08-22 14:16:22 -04:00 |
|
Max Schenkelberg
|
395dcaa255
|
Omaha #3541 Updated A2 baseline to reflect request service split
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93
Former-commit-id: 88ea402947 [formerly 896e353950] [formerly 88ea402947 [formerly 896e353950] [formerly e90bdb6fce [formerly e6b16ea30563c0afdd48822e8efc9faabadef8f0]]]
Former-commit-id: e90bdb6fce
Former-commit-id: ee4d9a965c [formerly 68221174c4]
Former-commit-id: e864d8a275
|
2014-08-22 13:15:42 -05:00 |
|
Brian.Dyke
|
5a878760f1
|
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 5b2b0d2bd9 [formerly a830b6d94c] [formerly 5b2b0d2bd9 [formerly a830b6d94c] [formerly 94577a1626 [formerly b2674ef57183706feb2bb17175d730bb2e213281]]]
Former-commit-id: 94577a1626
Former-commit-id: 0cbbceb7e3 [formerly a0af10ff2e]
Former-commit-id: d0a2060e84
|
2014-08-22 14:13:48 -04:00 |
|
Steve Harris
|
4ee93b8fc1
|
Omaha #3368 - removing cave/hydro
Former-commit-id: 8c66e2b895 [formerly 794208a255] [formerly 8c66e2b895 [formerly 794208a255] [formerly 9cda8755c6 [formerly a232972763ef0dcbccd5d83b3841498f1b77b7aa]]]
Former-commit-id: 9cda8755c6
Former-commit-id: 66b0e82582 [formerly d4862be8c6]
Former-commit-id: a9c3fabb8b
|
2014-08-22 13:08:32 -05:00 |
|
Richard Peter
|
6fe6ecc60f
|
Issue #3534 Update ThreadBasedAppender to extend UnsychronizedAppenderBase.
Change-Id: I6b01acd59f7fde5e98dcfe1f1221f8725fc0540b
Former-commit-id: 4cebb22560 [formerly ce238544d1] [formerly 4cebb22560 [formerly ce238544d1] [formerly a9af2314d3 [formerly 31e9cb1cfc15d79b204d4d16c1f7afa614bb9ca2]]]
Former-commit-id: a9af2314d3
Former-commit-id: a1abde3669 [formerly 7c74a4110e]
Former-commit-id: 0119aea767
|
2014-08-22 10:47:05 -05:00 |
|
steve.naples
|
b0240d7710
|
ASM #15664 Fixed issue with Tear Off menus not closing when perspective is closed, which caused an error.
Change-Id: If5fd120b7b34074686492d4cab9268ec1ac51a41
Former-commit-id: 1bde9a4013 [formerly c2bb43944c] [formerly 1bde9a4013 [formerly c2bb43944c] [formerly 7690281c5c [formerly e719245823220d7b583ffdb0adc88c8b71321369]]]
Former-commit-id: 7690281c5c
Former-commit-id: a3443402f2 [formerly 560cf97a6f]
Former-commit-id: 162cba6657
|
2014-08-22 15:21:35 +00:00 |
|
Brian Clements
|
930d64d738
|
Issue #3500 remove locking on osgi internals, rework gfe client startup
fixed error handling in loadConfig.py
added python to path in GfePyIncludeUtil
moved ProcedureXMLManager to overridable method in AbstractCaveComponent
Change-Id: Ie7dff55657ba216c47f7a56b3506cbed3a3f6ab2
Former-commit-id: bcc3e405e5 [formerly d62db22874] [formerly bcc3e405e5 [formerly d62db22874] [formerly 9f7905b58d [formerly b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684]]]
Former-commit-id: 9f7905b58d
Former-commit-id: d2c4e847ba [formerly 561977ecba]
Former-commit-id: 29a7557a0c
|
2014-08-22 08:56:56 -05:00 |
|
Greg Armendariz
|
d8e66d3d07
|
Merge "Omaha #3368 - Move ohd plugin to new repository" into omaha_14.4.1
Former-commit-id: b19a61cd10 [formerly 6370aaba96] [formerly b19a61cd10 [formerly 6370aaba96] [formerly b951f0e4eb [formerly 24376606c4974e3b22f120dac1c81a1752771ab1]]]
Former-commit-id: b951f0e4eb
Former-commit-id: c2bfd6975f [formerly 551e0a6a99]
Former-commit-id: e84a38aeea
|
2014-08-22 08:06:13 -05:00 |
|
Richard Peter
|
e731db9f47
|
Merge "Omaha #3528 - removed unused versions of ldm from the baseline" into omaha_14.4.1
Former-commit-id: 5a35e873ac [formerly 7331754776] [formerly 5a35e873ac [formerly 7331754776] [formerly fffa5f5294 [formerly 61a982c8624ab6e433692255109119ab9f74655c]]]
Former-commit-id: fffa5f5294
Former-commit-id: 9bb17c886d [formerly ea3ae775c4]
Former-commit-id: ff2891df3b
|
2014-08-21 18:10:00 -05:00 |
|