David Friedman
|
64b66c9dde
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: bb421fd3e4 [formerly ea1e9feb1d] [formerly a2dfe8e8f6] [formerly bb421fd3e4 [formerly ea1e9feb1d] [formerly a2dfe8e8f6] [formerly ea9230b37c [formerly a2dfe8e8f6 [formerly 6bfa1d6662b00925814be7126592bbe340651649]]]]
Former-commit-id: ea9230b37c
Former-commit-id: 25e0bcdc6f [formerly 10114b0bd1] [formerly 74a7d88387ec143a88a15084374737200a0e031a [formerly bc22f7309c]]
Former-commit-id: 2553d508e5b2d1bb6b928ee04f40220c66d897ac [formerly bfc3fa98b4]
Former-commit-id: 39c7024668
|
2014-08-28 15:43:32 +00:00 |
|
Nate Jensen
|
921ff430f2
|
Merge "Omaha #3503 Composite product generators init after spring beans are loaded" into omaha_14.4.1
Former-commit-id: b036c5b851 [formerly fb0829fd4d] [formerly de69231d3a] [formerly b036c5b851 [formerly fb0829fd4d] [formerly de69231d3a] [formerly afe94aca08 [formerly de69231d3a [formerly 1eb554cd30d53daf44de42e0ddd3f35bf8f37bae]]]]
Former-commit-id: afe94aca08
Former-commit-id: fc25b7f583 [formerly da6259a198] [formerly e28bfa9a0c5522e752aaeb4c6e11382a37536cf8 [formerly 8952d15b12]]
Former-commit-id: 67f566ba56399bcd07518bba90cd28fae82f4abc [formerly f3454a7941]
Former-commit-id: 2db6fa9583
|
2014-08-28 10:40:50 -05:00 |
|
Brian.Dyke
|
0ae9b53ca6
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: cbfd380b43 [formerly 76bd6575b6] [formerly 47ae6015e5] [formerly cbfd380b43 [formerly 76bd6575b6] [formerly 47ae6015e5] [formerly a24794ca7b [formerly 47ae6015e5 [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]]]]
Former-commit-id: a24794ca7b
Former-commit-id: 7288e9be2a [formerly 065b05e38c] [formerly d87cfe22daebbd0f64708e2b5401b5a9bc43a95e [formerly 0e9a17540d]]
Former-commit-id: 7849df2750377b7bb32208974c538f9b11a2620a [formerly bab69f3764]
Former-commit-id: c5aec69ab3
|
2014-08-28 11:39:48 -04:00 |
|
Nate Jensen
|
3876f26da7
|
Merge "Omaha #3453 Added the spell check dictionary to site level localization." into omaha_14.4.1
Former-commit-id: 7221b94904 [formerly 7bf0d7cd2a] [formerly 2710aed225] [formerly 7221b94904 [formerly 7bf0d7cd2a] [formerly 2710aed225] [formerly 8536f6681a [formerly 2710aed225 [formerly 2bac6ff5e600218f61343a7dc0f540c27f291924]]]]
Former-commit-id: 8536f6681a
Former-commit-id: b43a6418c7 [formerly f5810478ef] [formerly 10bd606cc6bf2a29f554ff34922524754debf4cf [formerly 3ddebb2170]]
Former-commit-id: 508ea1dcd7bc0ca2f7c09a313763aafa791fb985 [formerly 288db1aea0]
Former-commit-id: 94cf9816c7
|
2014-08-27 16:27:40 -05:00 |
|
Roger Ferrel
|
1b663590b4
|
Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml.
Former-commit-id: 2944c3770f [formerly 0147449477] [formerly fa42c4069a] [formerly 2944c3770f [formerly 0147449477] [formerly fa42c4069a] [formerly 9154ef60bb [formerly fa42c4069a [formerly 474e07b299246aee4e6b214226c176c4a10aa866]]]]
Former-commit-id: 9154ef60bb
Former-commit-id: db74982258 [formerly 17a8bd795d] [formerly 9c8c9bee1d8c31a829aaaca5968d61664e6d90fe [formerly 63a1b2890b]]
Former-commit-id: 5974e03bca22ea6311652bc9faaa322fe570944a [formerly 6e695a12d1]
Former-commit-id: 87b0200274
|
2014-08-27 15:06:52 -05:00 |
|
Brian Clements
|
8df5ce6b51
|
Omaha #3562 jetty upgrade change for dataserver
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663
Former-commit-id: 78e961b8f5 [formerly ab4eaee171] [formerly 3595bd2728] [formerly 78e961b8f5 [formerly ab4eaee171] [formerly 3595bd2728] [formerly 66da9e63b7 [formerly 3595bd2728 [formerly bb90464f68d562105809ef36f88869ff4570095c]]]]
Former-commit-id: 66da9e63b7
Former-commit-id: c6644cbe46 [formerly aa4dc98be0] [formerly dfcfb1b1cb51f20136796b65cef53843ab441829 [formerly 3efcaa6a8e]]
Former-commit-id: 9192075886511cdbd6d226a5edab1da735fd7fc9 [formerly 7a990efc0c]
Former-commit-id: 0efea299ab
|
2014-08-27 13:18:13 -05:00 |
|
Steve Harris
|
108d38a6e2
|
Merge branch 'master_14.2.2' (14.2.2-30) into omaha_14.2.2
Former-commit-id: b551b21437 [formerly 080a50d28c] [formerly 891019aadd] [formerly b551b21437 [formerly 080a50d28c] [formerly 891019aadd] [formerly d3b18900b3 [formerly 891019aadd [formerly 579781387325a36e27135b8384b2a8b14cb38317]]]]
Former-commit-id: d3b18900b3
Former-commit-id: 1508060d35 [formerly 60d5eec1b0] [formerly 21a5baadcdeaf201b5a2a14f4cba871239a0bec7 [formerly 683c32dc70]]
Former-commit-id: d634eda640b378264ee1e0f86ec9817a64114239 [formerly 3efff5ee42]
Former-commit-id: 02c026ccce
|
2014-08-27 11:34:06 -05:00 |
|
Brian.Dyke
|
2da6c7b93b
|
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: 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]
Former-commit-id: aa83bf804f
Former-commit-id: 4a56b6f6e1 [formerly f90649d7e7] [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3 [formerly f7f16ff9eb]]
Former-commit-id: 2b5f667a78842762d60c8ab0ba442f22b9229095 [formerly c0dc594eda]
Former-commit-id: 7e4ab705cc
|
2014-08-27 11:19:19 -04:00 |
|
Nate Jensen
|
f63011dc93
|
Merge "Omaha #3539 reworked link to editor action to avoid recursion warning" into omaha_14.4.1
Former-commit-id: 6a20d84a8a [formerly 697e1c0b79] [formerly 6fca563d21] [formerly 6a20d84a8a [formerly 697e1c0b79] [formerly 6fca563d21] [formerly 7acf4a04b2 [formerly 6fca563d21 [formerly bdc7d4cb7873651a4b59e0b6af9bb9dae931de77]]]]
Former-commit-id: 7acf4a04b2
Former-commit-id: 1f9c98e8c4 [formerly 783a805a8a] [formerly 1343844853810696ccafe2e8795d21ef1b7f8773 [formerly ff03dc5783]]
Former-commit-id: d1035c455860cde4dc794860a8608b437f23c688 [formerly 60b0b76d42]
Former-commit-id: ba9c46532e
|
2014-08-27 09:54:49 -05:00 |
|
Nate Jensen
|
cac6498b0f
|
Merge "Omaha #3356 configure path manager factory before spring initialization" into omaha_14.4.1
Former-commit-id: 1ea041a01e [formerly 0edb5fc46c] [formerly 2d1d18b2ff] [formerly 1ea041a01e [formerly 0edb5fc46c] [formerly 2d1d18b2ff] [formerly 1ad37de1ef [formerly 2d1d18b2ff [formerly 93e8fb3b1b27bdce2b15397e2ee7db6f1b419a05]]]]
Former-commit-id: 1ad37de1ef
Former-commit-id: b1f76d8b6d [formerly dc09d337f2] [formerly 39d951ec78dac285126b4df9a10e17fcf4d51d7c [formerly 571ae1d09e]]
Former-commit-id: 13aaf18bc8f110c0e6efa2fd45f405582d1ff00a [formerly 376670d221]
Former-commit-id: a739387842
|
2014-08-27 09:54:24 -05:00 |
|
Nate Jensen
|
e9d2de9c48
|
Omaha #3132 fix compilation issue from merge
Change-Id: I76e189ff871c2ca8f99806e035abb07087626fba
Former-commit-id: a70df06392 [formerly 2f0b209e10] [formerly 0160955244] [formerly a70df06392 [formerly 2f0b209e10] [formerly 0160955244] [formerly 3f7170f862 [formerly 0160955244 [formerly b45249baec6c6d4f77e5aeb23b910689df192c8a]]]]
Former-commit-id: 3f7170f862
Former-commit-id: c508bb668c [formerly 66c0933713] [formerly fc3a206bb36805ff0ce8c40da5b9af5501e60372 [formerly 281f360487]]
Former-commit-id: 735a41226d8d651ce153b2fe62599a50ad374487 [formerly 909bc9c412]
Former-commit-id: 728da699ad
|
2014-08-26 18:22:26 -05:00 |
|
Brian Clements
|
392cfad0e2
|
Omaha #3539 reworked link to editor action to avoid recursion warning
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01
Former-commit-id: 9509568efa [formerly a39a997a8d] [formerly a609334abf] [formerly 9509568efa [formerly a39a997a8d] [formerly a609334abf] [formerly f871058f67 [formerly a609334abf [formerly dcf9ea1ef4f7a7139f6c3700c04e9f9e2fda98e3]]]]
Former-commit-id: f871058f67
Former-commit-id: 3061205a6b [formerly f179d62459] [formerly 28575adbedc1689f7fc46cd5d53fb04c3af8bd28 [formerly e02be806d0]]
Former-commit-id: 3cb76351d8871b831667f7940cd204584bb11974 [formerly aa0cdd843c]
Former-commit-id: fcb9de6bf4
|
2014-08-26 17:22:20 -05:00 |
|
Brian Clements
|
6948aec9cd
|
Omaha #3503 Composite product generators init after spring beans are loaded
Change-Id: I894adbc14e1bfe183a3f7717d95dba85291a2a09
Former-commit-id: 11fa1b962c [formerly 5dc5530120] [formerly 095f84e71f] [formerly 11fa1b962c [formerly 5dc5530120] [formerly 095f84e71f] [formerly b88f012e69 [formerly 095f84e71f [formerly f6109e74ff5e26547c8fc03d7bb5ecde1046f689]]]]
Former-commit-id: b88f012e69
Former-commit-id: 2540fa9a95 [formerly f29fb0a656] [formerly f52e0674ecdaac7e697e849aef805d1954d0f156 [formerly e6b2143a6b]]
Former-commit-id: 2b18d20744bbddd9a580553d65302bd310fc36a0 [formerly 237bdc0e2a]
Former-commit-id: a08ebbe0c7
|
2014-08-26 17:12:34 -05:00 |
|
Nate Jensen
|
5e714459ca
|
Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44
Former-commit-id: 4a48867a81 [formerly f84e89b694] [formerly dbbf012a34] [formerly 4a48867a81 [formerly f84e89b694] [formerly dbbf012a34] [formerly fdc4cc60b9 [formerly dbbf012a34 [formerly 263452a82aef4756492fe02156525137b5ca09ff]]]]
Former-commit-id: fdc4cc60b9
Former-commit-id: 5690db1e94 [formerly 85a17ed23f] [formerly ec90e4ec5b78799ff8c90c5659475672966cd75e [formerly 70216d11e4]]
Former-commit-id: ca13b3031bbdcc900e3e1367503501855ce76f87 [formerly cf2e6693ed]
Former-commit-id: ac5a4234cb
|
2014-08-26 16:45:00 -05:00 |
|
Steve Harris
|
146dc3aec7
|
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: 33b4901c09 [formerly 8c5026314c] [formerly 99ae9bdc10] [formerly 33b4901c09 [formerly 8c5026314c] [formerly 99ae9bdc10] [formerly 038b284066 [formerly 99ae9bdc10 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]]]
Former-commit-id: 038b284066
Former-commit-id: 00b3ad8eb6 [formerly 1da31a86dc] [formerly c9abc2fce0e20d37683d43d809074ccd92db5423 [formerly c8ba2b1ae6]]
Former-commit-id: c07303fea0c9c3e107dabbeefbd395be90d9018f [formerly 84edac842e]
Former-commit-id: 9d263bc542
|
2014-08-26 16:25:21 -05:00 |
|
Nate Jensen
|
54a6cbb8d9
|
Merge "Omaha #3368 - removing cave/hydro" into omaha_14.4.1
Former-commit-id: bb4552ee2a [formerly 41e6446b49] [formerly 704ebac10a] [formerly bb4552ee2a [formerly 41e6446b49] [formerly 704ebac10a] [formerly b92d94d19d [formerly 704ebac10a [formerly d5db15de813a41767a1a10b0bfa07eb88c8dff6e]]]]
Former-commit-id: b92d94d19d
Former-commit-id: 8d0581a66d [formerly 0eea7a1105] [formerly 3efaa74664a741826024a3da6466b18e7749417f [formerly 08a3bcd85e]]
Former-commit-id: b4b5c391fc7f4c698dc46a1605859a8efe51d29f [formerly 0e17b3331e]
Former-commit-id: c107a88f8c
|
2014-08-26 13:42:13 -05:00 |
|
Nate Jensen
|
a96eca2d29
|
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: 9060f82413 [formerly e4df37dd05] [formerly 46fc72804a] [formerly 9060f82413 [formerly e4df37dd05] [formerly 46fc72804a] [formerly 448887b913 [formerly 46fc72804a [formerly 59c4919564db8f8ebf61fbac6ce2bdd29095479e]]]]
Former-commit-id: 448887b913
Former-commit-id: ef810f2d9e [formerly ac814cc6c9] [formerly 321a097fc9e5a18ceee0ca4fe7a03aed77dead94 [formerly 88ac1c057c]]
Former-commit-id: 43b335a6aafd4eb481385999fce7db1ccabc7ca3 [formerly 6c93e01bda]
Former-commit-id: 10980c927d
|
2014-08-26 13:39:15 -05:00 |
|
Brian.Dyke
|
bcdb3d4c19
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: acc3321457 [formerly 489fec4b25] [formerly 86f0ed23c1] [formerly acc3321457 [formerly 489fec4b25] [formerly 86f0ed23c1] [formerly b3767167c7 [formerly 86f0ed23c1 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]]]]
Former-commit-id: b3767167c7
Former-commit-id: ef2afe4f88 [formerly 1b9a28cc62] [formerly dfa43aa5c4d4a07843b46cd3b23eed8a26739086 [formerly f2b9203001]]
Former-commit-id: ab64fc858eafb7e5c8697e4fe618a1b8621ed5d0 [formerly 677ce2fb94]
Former-commit-id: 16dc3b41de
|
2014-08-26 13:31:34 -04:00 |
|
Nate Jensen
|
edda20d34a
|
Merge "Omaha #3541 fixed grid coverage spring" into omaha_14.4.1
Former-commit-id: 1b5cb51b4b [formerly d2a653e277] [formerly 169f5729db] [formerly 1b5cb51b4b [formerly d2a653e277] [formerly 169f5729db] [formerly 80ab7b8e53 [formerly 169f5729db [formerly 99211be9635e03e7ae117ff694912f7c58e7ab44]]]]
Former-commit-id: 80ab7b8e53
Former-commit-id: 1e4b11b2ee [formerly f3d6d3b90c] [formerly b0ca763e35be6d15c9ee8f28defa248af0c3c7a1 [formerly b51a4ffee6]]
Former-commit-id: 720c2975c0d0c10a1119d8b28a4809914ab2a63b [formerly a2784d994f]
Former-commit-id: 411825af28
|
2014-08-26 11:34:38 -05:00 |
|
Max Schenkelberg
|
8d3657ed54
|
Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea
Former-commit-id: d9536b7161 [formerly dacc10bcbc] [formerly 63967fbc78] [formerly d9536b7161 [formerly dacc10bcbc] [formerly 63967fbc78] [formerly 78b87b7a63 [formerly 63967fbc78 [formerly 3aff99e787a7368f40cdd161581ead2d3552118c]]]]
Former-commit-id: 78b87b7a63
Former-commit-id: 8b2b1013da [formerly 0a7a2fadec] [formerly 69cfa06cf3110cf0b0a3f06464a492b6de6bcd56 [formerly 7cfc26d1d7]]
Former-commit-id: 72bd8b39877326d1d084f39ad3ad4a274f7c39de [formerly 9048064741]
Former-commit-id: 0368097265
|
2014-08-26 11:32:20 -05:00 |
|
Max Schenkelberg
|
dab59fed84
|
Omaha #3541 fixed grid coverage spring
Change-Id: I6c69cbe530daee61127e05d7f94a0e2c92ebe2e7
Former-commit-id: 4b23f802ba [formerly ac67bd42b9] [formerly f7620471da] [formerly 4b23f802ba [formerly ac67bd42b9] [formerly f7620471da] [formerly df50024b63 [formerly f7620471da [formerly f2a76dfda110e231539474bffbde123fbe6313c9]]]]
Former-commit-id: df50024b63
Former-commit-id: 929fe3f461 [formerly 87e1c1a257] [formerly ac6ae681f3cb5b8dfaa6cf752f341c7d25e7a784 [formerly 6aff7b7a4c]]
Former-commit-id: 27c5e28c63d0587f2b277681844df9e3f1acf599 [formerly 47f4520d7c]
Former-commit-id: 2b110b1141
|
2014-08-26 11:28:42 -05:00 |
|
Steve Harris
|
cb8fb39f49
|
Merge branch 'master_14.3.1' (c4e9d3f = 14.2.4 -> 14.3.1 'ours merge') into omaha_14.4.1
Former-commit-id: 6113923c73 [formerly 93f812cab6] [formerly e8ffa194af] [formerly 6113923c73 [formerly 93f812cab6] [formerly e8ffa194af] [formerly e3a6f7b58b [formerly e8ffa194af [formerly 6306702a3bb6a58bfc7ef9a399d822950e8e9653]]]]
Former-commit-id: e3a6f7b58b
Former-commit-id: 9d404d99c5 [formerly 727aafe498] [formerly 9c97c3a4e87b80dfd88f7b932b704b6d4c10dee7 [formerly a4c38663f8]]
Former-commit-id: 79358cfb8766b38fc120c3009a7b4ff64a697c4c [formerly 4e6bb7670e]
Former-commit-id: 868067baa1
|
2014-08-26 10:30:10 -05:00 |
|
Brian.Dyke
|
eb989298c3
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: b99d31c7e6 [formerly 8ac44dfbd3] [formerly de56ccebc0] [formerly b99d31c7e6 [formerly 8ac44dfbd3] [formerly de56ccebc0] [formerly 59bacf90ac [formerly de56ccebc0 [formerly b13e744dbbcc332b9efd0799e87390bdf9bb1df3]]]]
Former-commit-id: 59bacf90ac
Former-commit-id: c2b8aa9023 [formerly dc14c2e6ce] [formerly 1aa12a57a91c266d9cae0f47f1830ad807f2a1d0 [formerly 8c803e81d3]]
Former-commit-id: d248a5cd3c84f91c9c7def176fde5802665acfbc [formerly c08a724cf0]
Former-commit-id: 6c1e526daf
|
2014-08-26 10:56:45 -04:00 |
|
Daniel.Huffman
|
75cbc60355
|
ASM #16715 - Reverted and augmented Cities.xml
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0
Former-commit-id: d7c82cf4be [formerly e2e132e7a5] [formerly 8962a069be] [formerly d7c82cf4be [formerly e2e132e7a5] [formerly 8962a069be] [formerly d1cd90b487 [formerly 8962a069be [formerly 2107976bd25c429521d4df7a92a3726a38806ba3]]]]
Former-commit-id: d1cd90b487
Former-commit-id: ebae452135 [formerly 7d09253674] [formerly 1d0b849f95b96d174f8fe7e2dac8ce729d2a1e58 [formerly 64672eb478]]
Former-commit-id: 9d4bcd480a7638756243875bdd8b10b8f6045689 [formerly ea8ec5fbe7]
Former-commit-id: 8c6fd18ece
|
2014-08-26 13:30:09 +00:00 |
|
Richard Peter
|
f3e79fbd6f
|
Omaha #3541 Fix request jvm startup and build
Change-Id: I6141ef1d74430fc43ea11f296c6ab95fc4276d6f
Former-commit-id: eeb9dd1a0e [formerly 64683e5784] [formerly bf5f1c27a7] [formerly eeb9dd1a0e [formerly 64683e5784] [formerly bf5f1c27a7] [formerly f478b42e61 [formerly bf5f1c27a7 [formerly 1c698d67a2c0ed3b11f910b593b1bbbdb2f46a86]]]]
Former-commit-id: f478b42e61
Former-commit-id: cc964bbb16 [formerly 832bd8d5e7] [formerly 568786a138efec77effe0e633ede4a9ebea149c7 [formerly ef45928158]]
Former-commit-id: 8d4d356508cafe54bb42446d9560c53d32e1de74 [formerly 820fb0085e]
Former-commit-id: 7964c0697d
|
2014-08-25 21:21:04 -05:00 |
|
Richard Peter
|
028aac838f
|
Merge "Omaha #3541 Updated A2 baseline to reflect request service split" into omaha_14.4.1
Former-commit-id: c1f0cfdcc0 [formerly 64848acf9d] [formerly 5cce505b7f] [formerly c1f0cfdcc0 [formerly 64848acf9d] [formerly 5cce505b7f] [formerly 651a10715a [formerly 5cce505b7f [formerly e2ed1054e382de6e3656fd9335dedc5af3692c17]]]]
Former-commit-id: 651a10715a
Former-commit-id: 8156239a5d [formerly 0992358153] [formerly 1468621a0d8c9d41a9402e27a2253c61db3b31cf [formerly eafe010aa1]]
Former-commit-id: de8b93ba75ee1bdae448adb782a9fa135eff4f41 [formerly ac192a5d86]
Former-commit-id: 147856f43d
|
2014-08-25 20:43:28 -05:00 |
|
Nate Jensen
|
b1b63781fc
|
Merge "Omaha #3368 fix deploy-install for developers without ohd repo" into omaha_14.4.1
Former-commit-id: 6566e3e75c [formerly bd8e79390b] [formerly 0017deea02] [formerly 6566e3e75c [formerly bd8e79390b] [formerly 0017deea02] [formerly e174537a36 [formerly 0017deea02 [formerly c9da6960b2aad034570cfa866432c9a143de47f0]]]]
Former-commit-id: e174537a36
Former-commit-id: 5331b1d594 [formerly 0cf41c2936] [formerly 83766c6475a78ce8f91f5c4793c79b6b653d2e36 [formerly fb52eb1083]]
Former-commit-id: 41dc4898576cfc866dd116c84f569f4bcb39df3a [formerly aeda9ad52d]
Former-commit-id: f42edfddbd
|
2014-08-25 16:20:41 -05:00 |
|
Ron Anderson
|
b9e30e763e
|
Merge "Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job" into omaha_14.4.1
Former-commit-id: 8ac2010d4b [formerly 3ffadac038] [formerly 753b715493] [formerly 8ac2010d4b [formerly 3ffadac038] [formerly 753b715493] [formerly 73fec5c36a [formerly 753b715493 [formerly 2cfb44f69025ba06e85a44e481bac1f88b851834]]]]
Former-commit-id: 73fec5c36a
Former-commit-id: 2b0d089159 [formerly 0ee02920ec] [formerly b43d8ff03fa7f849326b6b4c9e8f7f4d9dc9e336 [formerly eabf14a6fe]]
Former-commit-id: 491d492fa4a915cabddd8a0f0de16ff2e0a90882 [formerly 01dcd5de10]
Former-commit-id: 0d75ae75e3
|
2014-08-25 16:18:58 -05:00 |
|
Nate Jensen
|
8e1b968959
|
Omaha #3368 fix deploy-install for developers without ohd repo
Change-Id: Ib1738ed5e11022f5fd154ea85b29019e7c290f65
Former-commit-id: e3244ce993 [formerly db84f25bfd] [formerly 86f64337ff] [formerly e3244ce993 [formerly db84f25bfd] [formerly 86f64337ff] [formerly d43f0589f7 [formerly 86f64337ff [formerly e9d7e258c60d39ab0d043f1e1cdc0ebcaf998ccc]]]]
Former-commit-id: d43f0589f7
Former-commit-id: 1be8735d1b [formerly d4f3d09f11] [formerly ed5ad972dec2dba196ff6ea2e0d3138e9c949ca8 [formerly aed159a1e2]]
Former-commit-id: 232fe10cbbb29a00c518ffea135b21c5e4584bc1 [formerly abec6e86d9]
Former-commit-id: cbd7d00d1f
|
2014-08-25 16:16:34 -05:00 |
|
Richard Peter
|
02076146f3
|
Merge "Issue #3537 Fixed dirPattern in category Local." into omaha_14.2.4
Former-commit-id: 6396f11532 [formerly ab7facb903] [formerly 4ba39c5e56] [formerly 6396f11532 [formerly ab7facb903] [formerly 4ba39c5e56] [formerly 008a3e8f80 [formerly 4ba39c5e56 [formerly 5bb3f4a1215902e867d3e9ec5ca1d122067afd7e]]]]
Former-commit-id: 008a3e8f80
Former-commit-id: 7fc06eff0d [formerly 17c2c42cd2] [formerly db9e0e2a7fdda0d46fab9872d270205026e87d41 [formerly 2dd7596b68]]
Former-commit-id: 92d5a0993e2d368b76ebf331193aa7969087caf7 [formerly 8e073ab401]
Former-commit-id: 752f328338
|
2014-08-25 14:24:27 -05:00 |
|
Nate Jensen
|
90b1e0e9aa
|
Merge "Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override" into omaha_14.4.1
Former-commit-id: 2b15b6587e [formerly 76ca1815ad] [formerly 2516c869d2] [formerly 2b15b6587e [formerly 76ca1815ad] [formerly 2516c869d2] [formerly 1a48a8190f [formerly 2516c869d2 [formerly 5a0ccfe4b1effb0946e6d542c492bff45d6a904b]]]]
Former-commit-id: 1a48a8190f
Former-commit-id: 0c29cd1459 [formerly 2c09a51125] [formerly 384de854114c5b7d5c6b0092155676b848520f53 [formerly 85ececab93]]
Former-commit-id: a5fb452d823fa52df2cf390630ecc21a79fecbe8 [formerly 3ece89083f]
Former-commit-id: 626417bde9
|
2014-08-25 14:14:47 -05:00 |
|
Ron Anderson
|
fc6ff76874
|
Merge "Issue #3500 back port of loadConfig.py to fix gfe starup issue" into omaha_14.2.4
Former-commit-id: dee9a699ad [formerly 03173a9fe7] [formerly 4e6bbb4be4] [formerly dee9a699ad [formerly 03173a9fe7] [formerly 4e6bbb4be4] [formerly 4285719a08 [formerly 4e6bbb4be4 [formerly ae980bfccfedab3091b2708fae0dc36764dbffcb]]]]
Former-commit-id: 4285719a08
Former-commit-id: 1e3a94e3e4 [formerly fe93cb7510] [formerly 06e2debcd2974ef2d50793405e7728d260c70777 [formerly 6c3cafda59]]
Former-commit-id: b90a38bfc9b4cb38537b03a88e5468d30019bf90 [formerly 566db58f13]
Former-commit-id: a46f13d161
|
2014-08-25 14:04:41 -05:00 |
|
Mark Peters
|
c71622cbb3
|
Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override
Change-Id: Ic4a3a517327944f6c6ef7b20bc1774bca6c39d0e
Former-commit-id: 90833244de [formerly c7486f3952] [formerly 7b37c4d188] [formerly 90833244de [formerly c7486f3952] [formerly 7b37c4d188] [formerly 6634a2df01 [formerly 7b37c4d188 [formerly 449f167ce1c30a595b4b673fc4d71658500e844d]]]]
Former-commit-id: 6634a2df01
Former-commit-id: 798c0a374b [formerly 1c0e5a7d35] [formerly b6372971169a46ceee886eb93b197f2eb2a02307 [formerly f1d31723c7]]
Former-commit-id: e7787f8d6c35139134890b743646bc30777cf924 [formerly c069dd338a]
Former-commit-id: 2d9e8e0553
|
2014-08-25 13:50:27 -05:00 |
|
Brian Clements
|
776781b39c
|
Issue #3500 back port of loadConfig.py to fix gfe starup issue
Change-Id: I841af0ac81b86e499c0b52dedab64431e7f1ecd7
Former-commit-id: 5d794a5135 [formerly 960eb2dc29] [formerly 4314f71387] [formerly 5d794a5135 [formerly 960eb2dc29] [formerly 4314f71387] [formerly cf671dcda8 [formerly 4314f71387 [formerly 2a0af03242692708b3e752417ca7d60d28520768]]]]
Former-commit-id: cf671dcda8
Former-commit-id: cb34376804 [formerly 253b14b895] [formerly ad4290afd9237cad2ca05f14d0e5d7191bb86b8b [formerly f9756abf0a]]
Former-commit-id: 1fb9f395c099428c7cfe4498866fb60825fb08d7 [formerly 7bc93588a1]
Former-commit-id: 05bfc2943c
|
2014-08-25 13:34:36 -05:00 |
|
Roger Ferrel
|
cb510287d3
|
Issue #3537 Fixed dirPattern in category Local.
Former-commit-id: eb6992b3fa [formerly 1ff321ce51] [formerly c7a6040792] [formerly eb6992b3fa [formerly 1ff321ce51] [formerly c7a6040792] [formerly e451dd2814 [formerly c7a6040792 [formerly d40736ed992300be32ed4a62511fa436e9d167af]]]]
Former-commit-id: e451dd2814
Former-commit-id: a2d92f8552 [formerly 3d3f9cfb8c] [formerly dce5cb1b876921fa48d76b01c9951abb227edc02 [formerly 6f566c0f38]]
Former-commit-id: 4e526b9ac8cf4abf3e1c0daffa70d6e08a61d447 [formerly 7e3024f4f2]
Former-commit-id: 7a7a770dc6
|
2014-08-25 13:23:44 -05:00 |
|
Nate Jensen
|
81796e4d08
|
Merge "Issue #3500 remove locking on osgi internals, rework gfe client startup" into omaha_14.2.4
Former-commit-id: 41a7e2dbcd [formerly 0852d804ba] [formerly 5e46c55a76] [formerly 41a7e2dbcd [formerly 0852d804ba] [formerly 5e46c55a76] [formerly d66ac29640 [formerly 5e46c55a76 [formerly bb08cb510dc3d774e040b7d3a164dfa1d581aa1c]]]]
Former-commit-id: d66ac29640
Former-commit-id: 702239de9f [formerly d824e365d1] [formerly 4fa0bfb69b17bae7253b0667ffaee25774b64820 [formerly 5c943c5ddc]]
Former-commit-id: d618491bf8793852bfbd3ec1383e25783451911a [formerly 18902f8c9a]
Former-commit-id: 6bb1e7d4bd
|
2014-08-25 13:12:46 -05:00 |
|
Ron Anderson
|
e41ef00e62
|
Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job
Change-Id: Id759e14fcec25a68add1b65e9bf48d836ada14c0
Former-commit-id: 0cb234d764 [formerly 56b553ad0d] [formerly 8434195c57] [formerly 0cb234d764 [formerly 56b553ad0d] [formerly 8434195c57] [formerly 606e2b210c [formerly 8434195c57 [formerly 6b6213fe5b0ca48045fa59136b72efdf46f7e3f1]]]]
Former-commit-id: 606e2b210c
Former-commit-id: 512225160f [formerly 6c38d4f143] [formerly 7aabd59d0a6ed65868fcbace30e4217e4eef4d03 [formerly fda5c981f9]]
Former-commit-id: b36a094dd01554e3be1ec138023a4f1a30ab5895 [formerly 7799092b08]
Former-commit-id: eede0b99c3
|
2014-08-25 12:39:58 -05:00 |
|
Brian Clements
|
928f96021a
|
Omaha #2926 switched textdb to thrift client
Change-Id: I80a55506fa1e6d8780c0d3dbfb4b3c82b1aac9f1
Former-commit-id: 8a930b582a [formerly 344ba01102] [formerly 1bbf5d7346] [formerly 8a930b582a [formerly 344ba01102] [formerly 1bbf5d7346] [formerly c05e535cc8 [formerly 1bbf5d7346 [formerly 856ef48bab005bdb7de9dd4145fafc7fe12084f5]]]]
Former-commit-id: c05e535cc8
Former-commit-id: e15b5156db [formerly 65d5085dcf] [formerly a8b681ac9858375a256beaf3b32523c39c49ac43 [formerly 09d7136915]]
Former-commit-id: 288f3433a4af74bb77a665775881963c0bb9365d [formerly 7730ba55d4]
Former-commit-id: 9992138ebe
|
2014-08-25 10:28:48 -05:00 |
|
Steve Harris
|
325a595636
|
Merge branch 'master_14.2.2' (14.2.2-29) into omaha_14.2.2
Former-commit-id: 8a684bb351 [formerly 8aadfe944a] [formerly a03b5201cb] [formerly 8a684bb351 [formerly 8aadfe944a] [formerly a03b5201cb] [formerly d850919303 [formerly a03b5201cb [formerly 67c81cedb7321baad8dcf5fb4cea21ac152d2dcd]]]]
Former-commit-id: d850919303
Former-commit-id: 2560ce6724 [formerly 28937f26bc] [formerly 9438eed61e44da4ec8f772bce9429f8e45fdf8f7 [formerly 121a8ce866]]
Former-commit-id: e99ab9da49ecb0f8b1ae915a0ce3a8e55cb043fb [formerly a45850d88e]
Former-commit-id: f4883fed1e
|
2014-08-25 08:19:50 -05:00 |
|
Roger Ferrel
|
b3d2996e76
|
Omaha #3353 Changes to remove Geospatial data set generation off the UI thread.
Change-Id: I5213f627a97a27bdb92c4857eac4071c5450b790
Former-commit-id: 20362833cf [formerly a610e0a34b] [formerly ca3a0595d2] [formerly 20362833cf [formerly a610e0a34b] [formerly ca3a0595d2] [formerly d0779ef059 [formerly ca3a0595d2 [formerly f16a8ff2c51c392957e13ef63423abe9f99b3301]]]]
Former-commit-id: d0779ef059
Former-commit-id: 248bd0a393 [formerly be7d387a4b] [formerly 1fd4b3451da3ccea875b5e6dc43fa6eacddc8994 [formerly cfe1212590]]
Former-commit-id: 745fe2a291852f43240cb02cd4c30d6024a6d7fa [formerly a9d8c8f3f5]
Former-commit-id: c534338504
|
2014-08-25 07:59:26 -05:00 |
|
Brian.Dyke
|
9a5fa53446
|
Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: aecf73e71a [formerly a841eb53e5] [formerly a4376ec79f] [formerly aecf73e71a [formerly a841eb53e5] [formerly a4376ec79f] [formerly 0fbc5269ea [formerly a4376ec79f [formerly e673b3ff82b52be4cd4fbe2dab0859b98678f6ef]]]]
Former-commit-id: 0fbc5269ea
Former-commit-id: f72c19fd3c [formerly caa50716ff] [formerly 6d6fe3691f712c1bf4868acb2bc3528ca639977e [formerly 13d523eede]]
Former-commit-id: 23276a6c95a3ff3542db1d52456372fdad964d1a [formerly 20c4fb88d5]
Former-commit-id: d9ac0d95d4
|
2014-08-22 16:40:51 -04:00 |
|
Brian.Dyke
|
272905b186
|
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: 6402cb7d89 [formerly 2ddc920a4a] [formerly 325887e605] [formerly 6402cb7d89 [formerly 2ddc920a4a] [formerly 325887e605] [formerly dd9d7133d9 [formerly 325887e605 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]]
Former-commit-id: dd9d7133d9
Former-commit-id: e348a6abc7 [formerly c8e9153884] [formerly 7dbc20e2697aab4991870bf8493b74b08acbe56b [formerly 1839b614df]]
Former-commit-id: 85ccff40908964b07fef1c572de049c609434728 [formerly cd1b914f50]
Former-commit-id: 27372f098c
|
2014-08-22 14:16:22 -04:00 |
|
Max Schenkelberg
|
3fe9b3a357
|
Omaha #3541 Updated A2 baseline to reflect request service split
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93
Former-commit-id: 0419aeea52 [formerly 88ea402947] [formerly 896e353950] [formerly 0419aeea52 [formerly 88ea402947] [formerly 896e353950] [formerly e90bdb6fce [formerly 896e353950 [formerly e6b16ea30563c0afdd48822e8efc9faabadef8f0]]]]
Former-commit-id: e90bdb6fce
Former-commit-id: 9da9d7fe27 [formerly ee4d9a965c] [formerly 2cd1dab291464f00d51c5d42351d92f81defb05b [formerly 68221174c4]]
Former-commit-id: e6903f6858697e0f9f7137372b3aac308d58ed18 [formerly e864d8a275]
Former-commit-id: 395dcaa255
|
2014-08-22 13:15:42 -05:00 |
|
Brian.Dyke
|
348b4c12e9
|
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 64effd458c [formerly 5b2b0d2bd9] [formerly a830b6d94c] [formerly 64effd458c [formerly 5b2b0d2bd9] [formerly a830b6d94c] [formerly 94577a1626 [formerly a830b6d94c [formerly b2674ef57183706feb2bb17175d730bb2e213281]]]]
Former-commit-id: 94577a1626
Former-commit-id: 9c119c8431 [formerly 0cbbceb7e3] [formerly 5ebef4a85e30ac73432bcaf6ac7df852b8d06f7e [formerly a0af10ff2e]]
Former-commit-id: 522edbdb9ffeff69b90b3db092cedb88b93eea4b [formerly d0a2060e84]
Former-commit-id: 5a878760f1
|
2014-08-22 14:13:48 -04:00 |
|
Steve Harris
|
7a7e22ab95
|
Omaha #3368 - removing cave/hydro
Former-commit-id: 67432cb871 [formerly 8c66e2b895] [formerly 794208a255] [formerly 67432cb871 [formerly 8c66e2b895] [formerly 794208a255] [formerly 9cda8755c6 [formerly 794208a255 [formerly a232972763ef0dcbccd5d83b3841498f1b77b7aa]]]]
Former-commit-id: 9cda8755c6
Former-commit-id: d52408e0f8 [formerly 66b0e82582] [formerly e2b279d5d9d30a3618e923e7c8752b807f23e9cc [formerly d4862be8c6]]
Former-commit-id: 4f6eb89759b4005317f563ae16f56835da7d2234 [formerly a9c3fabb8b]
Former-commit-id: 4ee93b8fc1
|
2014-08-22 13:08:32 -05:00 |
|
Richard Peter
|
4bf9570210
|
Issue #3534 Update ThreadBasedAppender to extend UnsychronizedAppenderBase.
Change-Id: I6b01acd59f7fde5e98dcfe1f1221f8725fc0540b
Former-commit-id: ae3aa358e9 [formerly 4cebb22560] [formerly ce238544d1] [formerly ae3aa358e9 [formerly 4cebb22560] [formerly ce238544d1] [formerly a9af2314d3 [formerly ce238544d1 [formerly 31e9cb1cfc15d79b204d4d16c1f7afa614bb9ca2]]]]
Former-commit-id: a9af2314d3
Former-commit-id: 1c62a83ae8 [formerly a1abde3669] [formerly 4aeafb30d7dcfb61f9b17c635129ad6d8eddb705 [formerly 7c74a4110e]]
Former-commit-id: bbcf27cd1f3d9988aa5ef39112f7bbb21e734e53 [formerly 0119aea767]
Former-commit-id: 6fe6ecc60f
|
2014-08-22 10:47:05 -05:00 |
|
steve.naples
|
51ad18da35
|
ASM #15664 Fixed issue with Tear Off menus not closing when perspective is closed, which caused an error.
Change-Id: If5fd120b7b34074686492d4cab9268ec1ac51a41
Former-commit-id: 5345a81859 [formerly 1bde9a4013] [formerly c2bb43944c] [formerly 5345a81859 [formerly 1bde9a4013] [formerly c2bb43944c] [formerly 7690281c5c [formerly c2bb43944c [formerly e719245823220d7b583ffdb0adc88c8b71321369]]]]
Former-commit-id: 7690281c5c
Former-commit-id: 6710f1b499 [formerly a3443402f2] [formerly 48f6372c443d2dc759583c40eb155abec6fa9133 [formerly 560cf97a6f]]
Former-commit-id: a68aaacc0437ee9a353afd856e130fb189e7f671 [formerly 162cba6657]
Former-commit-id: b0240d7710
|
2014-08-22 15:21:35 +00:00 |
|
Brian Clements
|
a87e344a27
|
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: d3f0f7dea4 [formerly bcc3e405e5] [formerly d62db22874] [formerly d3f0f7dea4 [formerly bcc3e405e5] [formerly d62db22874] [formerly 9f7905b58d [formerly d62db22874 [formerly b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684]]]]
Former-commit-id: 9f7905b58d
Former-commit-id: b5bc73c517 [formerly d2c4e847ba] [formerly d45fd23deea0c9c7a5c6f3243a512210f490288a [formerly 561977ecba]]
Former-commit-id: 3e55f9cbe722bd44a7ad79c1733b24c7add3f40e [formerly 29a7557a0c]
Former-commit-id: 930d64d738
|
2014-08-22 08:56:56 -05:00 |
|
Greg Armendariz
|
85ffd5992f
|
Merge "Omaha #3368 - Move ohd plugin to new repository" into omaha_14.4.1
Former-commit-id: 8f4b51779d [formerly b19a61cd10] [formerly 6370aaba96] [formerly 8f4b51779d [formerly b19a61cd10] [formerly 6370aaba96] [formerly b951f0e4eb [formerly 6370aaba96 [formerly 24376606c4974e3b22f120dac1c81a1752771ab1]]]]
Former-commit-id: b951f0e4eb
Former-commit-id: 11036ca7cf [formerly c2bfd6975f] [formerly b68af63c0fbc2371531634fe2beb13df96e09de9 [formerly 551e0a6a99]]
Former-commit-id: 9a73a67f9157f559d57ca9442fcd92682f741308 [formerly e84a38aeea]
Former-commit-id: d8e66d3d07
|
2014-08-22 08:06:13 -05:00 |
|
Richard Peter
|
c381203200
|
Merge "Omaha #3528 - removed unused versions of ldm from the baseline" into omaha_14.4.1
Former-commit-id: b9a08291ec [formerly 5a35e873ac] [formerly 7331754776] [formerly b9a08291ec [formerly 5a35e873ac] [formerly 7331754776] [formerly fffa5f5294 [formerly 7331754776 [formerly 61a982c8624ab6e433692255109119ab9f74655c]]]]
Former-commit-id: fffa5f5294
Former-commit-id: 238d1aa554 [formerly 9bb17c886d] [formerly 78778cd279204109f20aa6114d0cee533bb01487 [formerly ea3ae775c4]]
Former-commit-id: 047dfe5227ab6a00529519249b0efdbf1cea0ff5 [formerly ff2891df3b]
Former-commit-id: e731db9f47
|
2014-08-21 18:10:00 -05:00 |
|